From 9fadc1e0639d39b4476d0f8d6b28b66c6c470f3f 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 23:11:39 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=99=E8=B4=A2=E5=8A=A1=E5=8D=95=E6=8D=AE?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=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 --- .../mappers/AccountHeadMapperEx.java | 8 +++++++- .../accountHead/AccountHeadComponent.java | 11 ++++++++--- .../accountHead/AccountHeadService.java | 10 ++++++---- .../mapper_xml/AccountHeadMapperEx.xml | 18 ++++++++++++++++++ 4 files changed, 39 insertions(+), 8 deletions(-) diff --git a/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/AccountHeadMapperEx.java b/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/AccountHeadMapperEx.java index 963bb10a..b379c84e 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/AccountHeadMapperEx.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/AccountHeadMapperEx.java @@ -17,6 +17,9 @@ public interface AccountHeadMapperEx { @Param("billNo") String billNo, @Param("beginTime") String beginTime, @Param("endTime") String endTime, + @Param("organId") Long organId, + @Param("creator") Long creator, + @Param("handsPersonId") Long handsPersonId, @Param("offset") Integer offset, @Param("rows") Integer rows); @@ -25,7 +28,10 @@ public interface AccountHeadMapperEx { @Param("creatorArray") String[] creatorArray, @Param("billNo") String billNo, @Param("beginTime") String beginTime, - @Param("endTime") String endTime); + @Param("endTime") String endTime, + @Param("organId") Long organId, + @Param("creator") Long creator, + @Param("handsPersonId") Long handsPersonId); BigDecimal findAllMoney( @Param("supplierId") Integer supplierId, diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/accountHead/AccountHeadComponent.java b/jshERP-boot/src/main/java/com/jsh/erp/service/accountHead/AccountHeadComponent.java index c4f1c670..0013c31d 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/service/accountHead/AccountHeadComponent.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/service/accountHead/AccountHeadComponent.java @@ -36,8 +36,10 @@ public class AccountHeadComponent implements ICommonQuery { String billNo = StringUtil.getInfo(search, "billNo"); String beginTime = StringUtil.getInfo(search, "beginTime"); String endTime = StringUtil.getInfo(search, "endTime"); - String order = QueryUtils.order(map); - return accountHeadService.select(type, roleType, billNo, beginTime, endTime, QueryUtils.offset(map), QueryUtils.rows(map)); + Long organId = StringUtil.parseStrLong(StringUtil.getInfo(search, "organId")); + Long creator = StringUtil.parseStrLong(StringUtil.getInfo(search, "creator")); + Long handsPersonId = StringUtil.parseStrLong(StringUtil.getInfo(search, "handsPersonId")); + return accountHeadService.select(type, roleType, billNo, beginTime, endTime, organId, creator, handsPersonId, QueryUtils.offset(map), QueryUtils.rows(map)); } @Override @@ -48,7 +50,10 @@ public class AccountHeadComponent implements ICommonQuery { String billNo = StringUtil.getInfo(search, "billNo"); String beginTime = StringUtil.getInfo(search, "beginTime"); String endTime = StringUtil.getInfo(search, "endTime"); - return accountHeadService.countAccountHead(type, roleType, billNo, beginTime, endTime); + Long organId = StringUtil.parseStrLong(StringUtil.getInfo(search, "organId")); + Long creator = StringUtil.parseStrLong(StringUtil.getInfo(search, "creator")); + Long handsPersonId = StringUtil.parseStrLong(StringUtil.getInfo(search, "handsPersonId")); + return accountHeadService.countAccountHead(type, roleType, billNo, beginTime, endTime, organId, creator, handsPersonId); } @Override diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/accountHead/AccountHeadService.java b/jshERP-boot/src/main/java/com/jsh/erp/service/accountHead/AccountHeadService.java index ff365096..1310a767 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/service/accountHead/AccountHeadService.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/service/accountHead/AccountHeadService.java @@ -87,13 +87,14 @@ public class AccountHeadService { return list; } - public List select(String type, String roleType, String billNo, String beginTime, String endTime, int offset, int rows) throws Exception{ + public List select(String type, String roleType, String billNo, String beginTime, String endTime, + Long organId, Long creator, Long handsPersonId, int offset, int rows) throws Exception{ List resList = new ArrayList<>(); try{ String [] creatorArray = getCreatorArray(roleType); beginTime = Tools.parseDayToTime(beginTime,BusinessConstants.DAY_FIRST_TIME); endTime = Tools.parseDayToTime(endTime,BusinessConstants.DAY_LAST_TIME); - List list = accountHeadMapperEx.selectByConditionAccountHead(type, creatorArray, billNo, beginTime, endTime, offset, rows); + List list = accountHeadMapperEx.selectByConditionAccountHead(type, creatorArray, billNo, beginTime, endTime, organId, creator, handsPersonId, offset, rows); if (null != list) { for (AccountHeadVo4ListEx ah : list) { if(ah.getChangeAmount() != null) { @@ -114,13 +115,14 @@ public class AccountHeadService { return resList; } - public Long countAccountHead(String type, String roleType, String billNo, String beginTime, String endTime) throws Exception{ + public Long countAccountHead(String type, String roleType, String billNo, String beginTime, String endTime, + Long organId, Long creator, Long handsPersonId) throws Exception{ Long result=null; try{ String [] creatorArray = getCreatorArray(roleType); beginTime = Tools.parseDayToTime(beginTime,BusinessConstants.DAY_FIRST_TIME); endTime = Tools.parseDayToTime(endTime,BusinessConstants.DAY_LAST_TIME); - result = accountHeadMapperEx.countsByAccountHead(type, creatorArray, billNo, beginTime, endTime); + result = accountHeadMapperEx.countsByAccountHead(type, creatorArray, billNo, beginTime, endTime, organId, creator, handsPersonId); }catch(Exception e){ JshException.readFail(logger, e); } diff --git a/jshERP-boot/src/main/resources/mapper_xml/AccountHeadMapperEx.xml b/jshERP-boot/src/main/resources/mapper_xml/AccountHeadMapperEx.xml index d83b7de8..37969fd8 100644 --- a/jshERP-boot/src/main/resources/mapper_xml/AccountHeadMapperEx.xml +++ b/jshERP-boot/src/main/resources/mapper_xml/AccountHeadMapperEx.xml @@ -30,6 +30,15 @@ and ah.bill_time <= #{endTime} + + and ah.organ_id=#{organId} + + + and ah.hands_person_id=#{handsPersonId} + + + and ah.creator=#{creator} + and ah.creator in ( @@ -63,6 +72,15 @@ and bill_time <= #{endTime} + + and organ_id=#{organId} + + + and hands_person_id=#{handsPersonId} + + + and creator=#{creator} + and creator in (