From 36d7640c71c831fac350433b99d445414e756502 Mon Sep 17 00:00:00 2001 From: jishenghua <752718920@qq.com> Date: Sat, 27 Apr 2024 10:48:52 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=99=E9=87=87=E8=B4=AD=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=85=B3=E8=81=94=E8=AF=B7=E8=B4=AD=E5=8D=95?= =?UTF-8?q?=E7=9A=84=E6=9F=A5=E8=AF=A2=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../erp/datasource/mappers/DepotHeadMapperEx.java | 2 ++ .../erp/service/depotHead/DepotHeadComponent.java | 6 ++++-- .../jsh/erp/service/depotHead/DepotHeadService.java | 12 +++++++----- .../main/resources/mapper_xml/DepotHeadMapperEx.xml | 8 ++++++++ 4 files changed, 21 insertions(+), 7 deletions(-) diff --git a/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/DepotHeadMapperEx.java b/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/DepotHeadMapperEx.java index 5616a718..acf4a179 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/DepotHeadMapperEx.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/DepotHeadMapperEx.java @@ -23,6 +23,7 @@ public interface DepotHeadMapperEx { @Param("statusArray") String[] statusArray, @Param("purchaseStatusArray") String[] purchaseStatusArray, @Param("number") String number, + @Param("linkApply") String linkApply, @Param("linkNumber") String linkNumber, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @@ -45,6 +46,7 @@ public interface DepotHeadMapperEx { @Param("statusArray") String[] statusArray, @Param("purchaseStatusArray") String[] purchaseStatusArray, @Param("number") String number, + @Param("linkApply") String linkApply, @Param("linkNumber") String linkNumber, @Param("beginTime") String beginTime, @Param("endTime") String endTime, diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/depotHead/DepotHeadComponent.java b/jshERP-boot/src/main/java/com/jsh/erp/service/depotHead/DepotHeadComponent.java index 5476979f..0e024094 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/service/depotHead/DepotHeadComponent.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/service/depotHead/DepotHeadComponent.java @@ -37,6 +37,7 @@ public class DepotHeadComponent implements ICommonQuery { String status = StringUtil.getInfo(search, "status"); String purchaseStatus = StringUtil.getInfo(search, "purchaseStatus"); String number = StringUtil.getInfo(search, "number"); + String linkApply = StringUtil.getInfo(search, "linkApply"); String linkNumber = StringUtil.getInfo(search, "linkNumber"); String beginTime = StringUtil.getInfo(search, "beginTime"); String endTime = StringUtil.getInfo(search, "endTime"); @@ -46,7 +47,7 @@ public class DepotHeadComponent implements ICommonQuery { Long depotId = StringUtil.parseStrLong(StringUtil.getInfo(search, "depotId")); Long accountId = StringUtil.parseStrLong(StringUtil.getInfo(search, "accountId")); String remark = StringUtil.getInfo(search, "remark"); - return depotHeadService.select(type, subType, hasDebt, status, purchaseStatus, number, linkNumber, + return depotHeadService.select(type, subType, hasDebt, status, purchaseStatus, number, linkApply, linkNumber, beginTime, endTime, materialParam, organId, creator, depotId, accountId, remark, QueryUtils.offset(map), QueryUtils.rows(map)); } @@ -59,6 +60,7 @@ public class DepotHeadComponent implements ICommonQuery { String status = StringUtil.getInfo(search, "status"); String purchaseStatus = StringUtil.getInfo(search, "purchaseStatus"); String number = StringUtil.getInfo(search, "number"); + String linkApply = StringUtil.getInfo(search, "linkApply"); String linkNumber = StringUtil.getInfo(search, "linkNumber"); String beginTime = StringUtil.getInfo(search, "beginTime"); String endTime = StringUtil.getInfo(search, "endTime"); @@ -68,7 +70,7 @@ public class DepotHeadComponent implements ICommonQuery { Long depotId = StringUtil.parseStrLong(StringUtil.getInfo(search, "depotId")); Long accountId = StringUtil.parseStrLong(StringUtil.getInfo(search, "accountId")); String remark = StringUtil.getInfo(search, "remark"); - return depotHeadService.countDepotHead(type, subType, hasDebt, status, purchaseStatus, number, linkNumber, + return depotHeadService.countDepotHead(type, subType, hasDebt, status, purchaseStatus, number, linkApply, linkNumber, beginTime, endTime, materialParam, organId, creator, depotId, accountId, remark); } diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java b/jshERP-boot/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java index a794cd63..e9744725 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java @@ -113,7 +113,7 @@ public class DepotHeadService { return list; } - public List select(String type, String subType, String hasDebt, String status, String purchaseStatus, String number, String linkNumber, + public List select(String type, String subType, String hasDebt, String status, String purchaseStatus, String number, String linkApply, String linkNumber, String beginTime, String endTime, String materialParam, Long organId, Long creator, Long depotId, Long accountId, String remark, int offset, int rows) throws Exception { List resList = new ArrayList<>(); try{ @@ -132,8 +132,9 @@ public class DepotHeadService { Map accountMap = accountService.getAccountMap(); beginTime = Tools.parseDayToTime(beginTime,BusinessConstants.DAY_FIRST_TIME); endTime = Tools.parseDayToTime(endTime,BusinessConstants.DAY_LAST_TIME); - List list = depotHeadMapperEx.selectByConditionDepotHead(type, subType, creatorArray, hasDebt, statusArray, purchaseStatusArray, number, linkNumber, beginTime, endTime, - materialParam, organId, organArray, creator, depotId, depotArray, accountId, remark, offset, rows); + List list = depotHeadMapperEx.selectByConditionDepotHead(type, subType, creatorArray, hasDebt, + statusArray, purchaseStatusArray, number, linkApply, linkNumber, beginTime, endTime, + materialParam, organId, organArray, creator, depotId, depotArray, accountId, remark, offset, rows); if (null != list) { List idList = new ArrayList<>(); List numberList = new ArrayList<>(); @@ -227,7 +228,7 @@ public class DepotHeadService { return resList; } - public Long countDepotHead(String type, String subType, String hasDebt, String status, String purchaseStatus, String number, String linkNumber, + public Long countDepotHead(String type, String subType, String hasDebt, String status, String purchaseStatus, String number, String linkApply, String linkNumber, String beginTime, String endTime, String materialParam, Long organId, Long creator, Long depotId, Long accountId, String remark) throws Exception{ Long result=null; try{ @@ -240,7 +241,8 @@ public class DepotHeadService { creatorArray = StringUtil.isNotEmpty(purchaseStatus) ? null: creatorArray; beginTime = Tools.parseDayToTime(beginTime,BusinessConstants.DAY_FIRST_TIME); endTime = Tools.parseDayToTime(endTime,BusinessConstants.DAY_LAST_TIME); - result=depotHeadMapperEx.countsByDepotHead(type, subType, creatorArray, hasDebt, statusArray, purchaseStatusArray, number, linkNumber, beginTime, endTime, + result=depotHeadMapperEx.countsByDepotHead(type, subType, creatorArray, hasDebt, + statusArray, purchaseStatusArray, number, linkApply, linkNumber, beginTime, endTime, materialParam, organId, organArray, creator, depotId, depotArray, accountId, remark); }catch(Exception e){ JshException.readFail(logger, e); diff --git a/jshERP-boot/src/main/resources/mapper_xml/DepotHeadMapperEx.xml b/jshERP-boot/src/main/resources/mapper_xml/DepotHeadMapperEx.xml index 9fbc43b3..06cc87e4 100644 --- a/jshERP-boot/src/main/resources/mapper_xml/DepotHeadMapperEx.xml +++ b/jshERP-boot/src/main/resources/mapper_xml/DepotHeadMapperEx.xml @@ -84,6 +84,10 @@ and dh.number like #{bindNumber} + + + and dh.link_apply like #{bindLinkApply} + and dh.link_number like #{bindLinkNumber} @@ -192,6 +196,10 @@ and dh.number like #{bindNumber} + + + and dh.link_apply like #{bindLinkApply} + and dh.link_number like #{bindLinkNumber}