From 8dfa967b46055888dc50813111e5071fd711e295 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com> Date: Sun, 14 Nov 2021 22:47:56 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=99=E5=8D=95=E6=8D=AE=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E5=85=B3=E8=81=94=E5=8D=95=E6=8D=AE=E7=9A=84=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6?= 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, 20 insertions(+), 8 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 86773e80..ce3dc0b2 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 @@ -24,6 +24,7 @@ public interface DepotHeadMapperEx { @Param("creatorArray") String[] creatorArray, @Param("statusArray") String[] statusArray, @Param("number") String number, + @Param("linkNumber") String linkNumber, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("materialParam") String materialParam, @@ -40,6 +41,7 @@ public interface DepotHeadMapperEx { @Param("creatorArray") String[] creatorArray, @Param("statusArray") String[] statusArray, @Param("number") String number, + @Param("linkNumber") String linkNumber, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("materialParam") String materialParam, 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 ae908b3c..04d5e420 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 @@ -36,13 +36,14 @@ public class DepotHeadComponent implements ICommonQuery { String roleType = StringUtil.getInfo(search, "roleType"); String status = StringUtil.getInfo(search, "status"); String number = StringUtil.getInfo(search, "number"); + String linkNumber = StringUtil.getInfo(search, "linkNumber"); String beginTime = StringUtil.getInfo(search, "beginTime"); String endTime = StringUtil.getInfo(search, "endTime"); String materialParam = StringUtil.getInfo(search, "materialParam"); Long organId = StringUtil.parseStrLong(StringUtil.getInfo(search, "organId")); Long creator = StringUtil.parseStrLong(StringUtil.getInfo(search, "creator")); Long depotId = StringUtil.parseStrLong(StringUtil.getInfo(search, "depotId")); - return depotHeadService.select(type, subType, roleType, status, number, beginTime, endTime, materialParam, + return depotHeadService.select(type, subType, roleType, status, number, linkNumber, beginTime, endTime, materialParam, organId, creator, depotId, QueryUtils.offset(map), QueryUtils.rows(map)); } @@ -54,13 +55,14 @@ public class DepotHeadComponent implements ICommonQuery { String roleType = StringUtil.getInfo(search, "roleType"); String status = StringUtil.getInfo(search, "status"); String number = StringUtil.getInfo(search, "number"); + String linkNumber = StringUtil.getInfo(search, "linkNumber"); String beginTime = StringUtil.getInfo(search, "beginTime"); String endTime = StringUtil.getInfo(search, "endTime"); String materialParam = StringUtil.getInfo(search, "materialParam"); Long organId = StringUtil.parseStrLong(StringUtil.getInfo(search, "organId")); Long creator = StringUtil.parseStrLong(StringUtil.getInfo(search, "creator")); Long depotId = StringUtil.parseStrLong(StringUtil.getInfo(search, "depotId")); - return depotHeadService.countDepotHead(type, subType, roleType, status, number, beginTime, endTime, materialParam, + return depotHeadService.countDepotHead(type, subType, roleType, status, number, linkNumber, beginTime, endTime, materialParam, organId, creator, depotId); } 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 309daa68..5f7add3b 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 @@ -100,8 +100,8 @@ public class DepotHeadService { return list; } - public List select(String type, String subType, String roleType, String status, String number, String beginTime, String endTime, - String materialParam, Long organId, Long creator, Long depotId, int offset, int rows)throws Exception { + public List select(String type, String subType, String roleType, String status, String number, String linkNumber, + String beginTime, String endTime, String materialParam, Long organId, Long creator, Long depotId, int offset, int rows) throws Exception { List resList = new ArrayList<>(); List list=new ArrayList<>(); try{ @@ -112,7 +112,7 @@ public class DepotHeadService { Map accountMap = accountService.getAccountMap(); beginTime = Tools.parseDayToTime(beginTime,BusinessConstants.DAY_FIRST_TIME); endTime = Tools.parseDayToTime(endTime,BusinessConstants.DAY_LAST_TIME); - list=depotHeadMapperEx.selectByConditionDepotHead(type, subType, creatorArray, statusArray, number, beginTime, endTime, + list=depotHeadMapperEx.selectByConditionDepotHead(type, subType, creatorArray, statusArray, number, linkNumber, beginTime, endTime, materialParam, organId, creator, depotId, depotArray, offset, rows); if (null != list) { for (DepotHeadVo4List dh : list) { @@ -150,8 +150,8 @@ public class DepotHeadService { return resList; } - public Long countDepotHead(String type, String subType, String roleType, String status, String number, String beginTime, String endTime, - String materialParam, Long organId, Long creator, Long depotId) throws Exception{ + public Long countDepotHead(String type, String subType, String roleType, String status, String number, String linkNumber, + String beginTime, String endTime, String materialParam, Long organId, Long creator, Long depotId) throws Exception{ Long result=null; try{ String [] depotArray = getDepotArray(subType); @@ -159,7 +159,7 @@ public class DepotHeadService { String [] statusArray = StringUtil.isNotEmpty(status) ? status.split(",") : null; beginTime = Tools.parseDayToTime(beginTime,BusinessConstants.DAY_FIRST_TIME); endTime = Tools.parseDayToTime(endTime,BusinessConstants.DAY_LAST_TIME); - result=depotHeadMapperEx.countsByDepotHead(type, subType, creatorArray, statusArray, number, beginTime, endTime, + result=depotHeadMapperEx.countsByDepotHead(type, subType, creatorArray, statusArray, number, linkNumber, beginTime, endTime, materialParam, organId, creator, depotId, depotArray); }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 3765944d..12fecffb 100644 --- a/jshERP-boot/src/main/resources/mapper_xml/DepotHeadMapperEx.xml +++ b/jshERP-boot/src/main/resources/mapper_xml/DepotHeadMapperEx.xml @@ -73,6 +73,10 @@ and dh.number like #{bindNumber} + + + and dh.link_number like #{bindLinkNumber} + and dh.oper_time >= #{beginTime} @@ -137,6 +141,10 @@ and dh.number like #{bindNumber} + + + and dh.link_number like #{bindLinkNumber} + and dh.oper_time >= #{beginTime}