From 6a4b4e27be3b72f42eaff01240b1fc7379b4f9d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com> Date: Thu, 15 Jul 2021 01:21:01 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=99=E5=8D=95=E6=8D=AE=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../erp/controller/DepotHeadController.java | 2 +- .../datasource/mappers/DepotHeadMapperEx.java | 6 ++++++ .../service/depotHead/DepotHeadComponent.java | 12 ++++++++++-- .../service/depotHead/DepotHeadService.java | 12 +++++++----- .../java/com/jsh/erp/utils/StringUtil.java | 8 ++++++++ .../resources/mapper_xml/DepotHeadMapperEx.xml | 18 ++++++++++++++++++ 6 files changed, 50 insertions(+), 8 deletions(-) diff --git a/jshERP-boot/src/main/java/com/jsh/erp/controller/DepotHeadController.java b/jshERP-boot/src/main/java/com/jsh/erp/controller/DepotHeadController.java index 94337260..2bb2fd86 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/controller/DepotHeadController.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/controller/DepotHeadController.java @@ -271,7 +271,7 @@ public class DepotHeadController { String rows = body.getRows(); Long billsNumLimit = Long.parseLong(redisService.getObjectFromSessionByKey(request,"billsNumLimit").toString()); Long tenantId = redisService.getTenantId(request); - Long count = depotHeadService.countDepotHead(null,null,null,null,null,null,null,null); + Long count = depotHeadService.countDepotHead(null,null,null,null,null,null,null,null,null,null,null); if(count>= billsNumLimit) { throw new BusinessParamCheckingException(ExceptionConstants.DEPOT_HEAD_OVER_LIMIT_FAILED_CODE, ExceptionConstants.DEPOT_HEAD_OVER_LIMIT_FAILED_MSG); 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 866273bb..85bc7354 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 @@ -27,6 +27,9 @@ public interface DepotHeadMapperEx { @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("materialParam") String materialParam, + @Param("organId") Long organId, + @Param("creator") Long creator, + @Param("depotId") Long depotId, @Param("depotArray") String[] depotArray, @Param("offset") Integer offset, @Param("rows") Integer rows); @@ -40,6 +43,9 @@ public interface DepotHeadMapperEx { @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("materialParam") String materialParam, + @Param("organId") Long organId, + @Param("creator") Long creator, + @Param("depotId") Long depotId, @Param("depotArray") String[] depotArray); String findMaterialsListByHeaderId( 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 4fcb77c4..ae908b3c 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 @@ -39,7 +39,11 @@ public class DepotHeadComponent implements ICommonQuery { String beginTime = StringUtil.getInfo(search, "beginTime"); String endTime = StringUtil.getInfo(search, "endTime"); String materialParam = StringUtil.getInfo(search, "materialParam"); - return depotHeadService.select(type, subType, roleType, status, number, beginTime, endTime, materialParam, QueryUtils.offset(map), QueryUtils.rows(map)); + 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, + organId, creator, depotId, QueryUtils.offset(map), QueryUtils.rows(map)); } @Override @@ -53,7 +57,11 @@ public class DepotHeadComponent implements ICommonQuery { String beginTime = StringUtil.getInfo(search, "beginTime"); String endTime = StringUtil.getInfo(search, "endTime"); String materialParam = StringUtil.getInfo(search, "materialParam"); - return depotHeadService.countDepotHead(type, subType, roleType, status, number, beginTime, endTime, 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, + organId, creator, depotId); } @Override 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 c5f6f1c0..a3c389ff 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 @@ -104,8 +104,8 @@ public class DepotHeadService { } public List select(String type, String subType, String roleType, String status, String number, String beginTime, String endTime, - String materialParam, int offset, int rows)throws Exception { - List resList = new ArrayList(); + String materialParam, Long organId, Long creator, Long depotId, int offset, int rows)throws Exception { + List resList = new ArrayList<>(); List list=new ArrayList<>(); try{ String depotIds = depotService.findDepotStrByCurrentUser(); @@ -115,7 +115,8 @@ 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, status, number, beginTime, endTime, materialParam, depotArray, offset, rows); + list=depotHeadMapperEx.selectByConditionDepotHead(type, subType, creatorArray, status, number, beginTime, endTime, + materialParam, organId, creator, depotId, depotArray, offset, rows); if (null != list) { for (DepotHeadVo4List dh : list) { if(accountMap!=null && StringUtil.isNotEmpty(dh.getAccountIdList()) && StringUtil.isNotEmpty(dh.getAccountMoneyList())) { @@ -153,7 +154,7 @@ public class DepotHeadService { } public Long countDepotHead(String type, String subType, String roleType, String status, String number, String beginTime, String endTime, - String materialParam) throws Exception{ + String materialParam, Long organId, Long creator, Long depotId) throws Exception{ Long result=null; try{ String depotIds = depotService.findDepotStrByCurrentUser(); @@ -161,7 +162,8 @@ public class DepotHeadService { String [] creatorArray = getCreatorArray(roleType); beginTime = Tools.parseDayToTime(beginTime,BusinessConstants.DAY_FIRST_TIME); endTime = Tools.parseDayToTime(endTime,BusinessConstants.DAY_LAST_TIME); - result=depotHeadMapperEx.countsByDepotHead(type, subType, creatorArray, status, number, beginTime, endTime, materialParam, depotArray); + result=depotHeadMapperEx.countsByDepotHead(type, subType, creatorArray, status, number, beginTime, endTime, + materialParam, organId, creator, depotId, depotArray); }catch(Exception e){ JshException.readFail(logger, e); } diff --git a/jshERP-boot/src/main/java/com/jsh/erp/utils/StringUtil.java b/jshERP-boot/src/main/java/com/jsh/erp/utils/StringUtil.java index e90a453d..cbf96963 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/utils/StringUtil.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/utils/StringUtil.java @@ -93,6 +93,14 @@ public class StringUtil { } } + public static Long parseStrLong(String str) { + if (StringUtil.isNotEmpty(str)) { + return Long.parseLong(str); + } else { + return null; + } + } + public static List listToUUID(List listStrs) { if (listStrs != null && listStrs.size() > 0) { List uuidList = new ArrayList(); diff --git a/jshERP-boot/src/main/resources/mapper_xml/DepotHeadMapperEx.xml b/jshERP-boot/src/main/resources/mapper_xml/DepotHeadMapperEx.xml index bb34f4ce..6fd7a2f1 100644 --- a/jshERP-boot/src/main/resources/mapper_xml/DepotHeadMapperEx.xml +++ b/jshERP-boot/src/main/resources/mapper_xml/DepotHeadMapperEx.xml @@ -74,6 +74,15 @@ and (m.name like #{bindKey} or m.standard like #{bindKey} or m.model like #{bindKey}) + + and dh.organ_id=#{organId} + + + and dh.creator=#{creator} + + + and di.depot_id=#{depotId} + and di.depot_id in ( @@ -124,6 +133,15 @@ and (m.name like #{bindKey} or m.standard like #{bindKey} or m.model like #{bindKey}) + + and dh.organ_id=#{organId} + + + and dh.creator=#{creator} + + + and di.depot_id=#{depotId} + and di.depot_id in (