From 44b8ea4699dd7faf057f921d3290cb705f9827ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A5=9E=E8=AF=9D?= <752718920@qq.com> Date: Sat, 7 May 2022 22:55:02 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=99=E5=8D=95=E6=8D=AE=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E8=B4=A6=E6=88=B7=E3=80=81=E7=8A=B6=E6=80=81=E5=92=8C=E5=A4=87?= =?UTF-8?q?=E6=B3=A8=E7=9A=84=E7=AD=9B=E9=80=89=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mappers/AccountHeadMapperEx.java | 8 +++++++- .../datasource/mappers/DepotHeadMapperEx.java | 6 +++++- .../accountHead/AccountHeadComponent.java | 12 +++++++++-- .../accountHead/AccountHeadService.java | 12 +++++++---- .../service/depotHead/DepotHeadComponent.java | 8 ++++++-- .../service/depotHead/DepotHeadService.java | 16 +++++++-------- .../mapper_xml/AccountHeadMapperEx.xml | 20 +++++++++++++++++++ .../mapper_xml/DepotHeadMapperEx.xml | 16 +++++++++++++++ 8 files changed, 80 insertions(+), 18 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 b379c84e..8130c31c 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 @@ -20,6 +20,9 @@ public interface AccountHeadMapperEx { @Param("organId") Long organId, @Param("creator") Long creator, @Param("handsPersonId") Long handsPersonId, + @Param("accountId") Long accountId, + @Param("status") String status, + @Param("remark") String remark, @Param("offset") Integer offset, @Param("rows") Integer rows); @@ -31,7 +34,10 @@ public interface AccountHeadMapperEx { @Param("endTime") String endTime, @Param("organId") Long organId, @Param("creator") Long creator, - @Param("handsPersonId") Long handsPersonId); + @Param("handsPersonId") Long handsPersonId, + @Param("accountId") Long accountId, + @Param("status") String status, + @Param("remark") String remark); BigDecimal findAllMoney( @Param("supplierId") Integer supplierId, 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 12fb3644..4f157373 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 @@ -32,6 +32,8 @@ public interface DepotHeadMapperEx { @Param("creator") Long creator, @Param("depotId") Long depotId, @Param("depotArray") String[] depotArray, + @Param("accountId") Long accountId, + @Param("remark") String remark, @Param("offset") Integer offset, @Param("rows") Integer rows); @@ -48,7 +50,9 @@ public interface DepotHeadMapperEx { @Param("organId") Long organId, @Param("creator") Long creator, @Param("depotId") Long depotId, - @Param("depotArray") String[] depotArray); + @Param("depotArray") String[] depotArray, + @Param("accountId") Long accountId, + @Param("remark") String remark); String findMaterialsListByHeaderId( @Param("id") Long id); 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 0013c31d..950203d4 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 @@ -39,7 +39,11 @@ public class AccountHeadComponent implements ICommonQuery { 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)); + Long accountId = StringUtil.parseStrLong(StringUtil.getInfo(search, "accountId")); + String status = StringUtil.getInfo(search, "status"); + String remark = StringUtil.getInfo(search, "remark"); + return accountHeadService.select(type, roleType, billNo, beginTime, endTime, organId, creator, handsPersonId, + accountId, status, remark, QueryUtils.offset(map), QueryUtils.rows(map)); } @Override @@ -53,7 +57,11 @@ public class AccountHeadComponent implements ICommonQuery { 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); + Long accountId = StringUtil.parseStrLong(StringUtil.getInfo(search, "accountId")); + String status = StringUtil.getInfo(search, "status"); + String remark = StringUtil.getInfo(search, "remark"); + return accountHeadService.countAccountHead(type, roleType, billNo, beginTime, endTime, organId, creator, handsPersonId, + accountId, status, remark); } @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 0eb05e7d..90ade067 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,15 @@ public class AccountHeadService { } 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{ + Long organId, Long creator, Long handsPersonId, Long accountId, String status, + String remark, 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, organId, creator, handsPersonId, offset, rows); + List list = accountHeadMapperEx.selectByConditionAccountHead(type, creatorArray, billNo, + beginTime, endTime, organId, creator, handsPersonId, accountId, status, remark, offset, rows); if (null != list) { for (AccountHeadVo4ListEx ah : list) { if(ah.getChangeAmount() != null) { @@ -115,13 +117,15 @@ public class AccountHeadService { } public Long countAccountHead(String type, String roleType, String billNo, String beginTime, String endTime, - Long organId, Long creator, Long handsPersonId) throws Exception{ + Long organId, Long creator, Long handsPersonId, Long accountId, String status, + String remark) 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, organId, creator, handsPersonId); + result = accountHeadMapperEx.countsByAccountHead(type, creatorArray, billNo, + beginTime, endTime, organId, creator, handsPersonId, accountId, status, remark); }catch(Exception e){ JshException.readFail(logger, e); } 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 04d5e420..b8735253 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 @@ -43,8 +43,10 @@ public class DepotHeadComponent implements ICommonQuery { Long organId = StringUtil.parseStrLong(StringUtil.getInfo(search, "organId")); Long creator = StringUtil.parseStrLong(StringUtil.getInfo(search, "creator")); 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, roleType, status, number, linkNumber, beginTime, endTime, materialParam, - organId, creator, depotId, QueryUtils.offset(map), QueryUtils.rows(map)); + organId, creator, depotId, accountId, remark, QueryUtils.offset(map), QueryUtils.rows(map)); } @Override @@ -62,8 +64,10 @@ public class DepotHeadComponent implements ICommonQuery { Long organId = StringUtil.parseStrLong(StringUtil.getInfo(search, "organId")); Long creator = StringUtil.parseStrLong(StringUtil.getInfo(search, "creator")); 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, roleType, status, number, linkNumber, beginTime, endTime, materialParam, - organId, creator, depotId); + organId, creator, depotId, accountId, remark); } @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 26745298..329b9f97 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 @@ -101,7 +101,7 @@ public class DepotHeadService { } 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 { + 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<>(); List list=new ArrayList<>(); try{ @@ -113,7 +113,7 @@ public class DepotHeadService { beginTime = Tools.parseDayToTime(beginTime,BusinessConstants.DAY_FIRST_TIME); endTime = Tools.parseDayToTime(endTime,BusinessConstants.DAY_LAST_TIME); list=depotHeadMapperEx.selectByConditionDepotHead(type, subType, creatorArray, statusArray, number, linkNumber, beginTime, endTime, - materialParam, organId, creator, depotId, depotArray, offset, rows); + materialParam, organId, creator, depotId, depotArray, accountId, remark, offset, rows); if (null != list) { for (DepotHeadVo4List dh : list) { if(accountMap!=null && StringUtil.isNotEmpty(dh.getAccountIdList()) && StringUtil.isNotEmpty(dh.getAccountMoneyList())) { @@ -151,7 +151,7 @@ public class DepotHeadService { } 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{ + String beginTime, String endTime, String materialParam, Long organId, Long creator, Long depotId, Long accountId, String remark) throws Exception{ Long result=null; try{ String [] depotArray = getDepotArray(subType); @@ -160,7 +160,7 @@ public class DepotHeadService { beginTime = Tools.parseDayToTime(beginTime,BusinessConstants.DAY_FIRST_TIME); endTime = Tools.parseDayToTime(endTime,BusinessConstants.DAY_LAST_TIME); result=depotHeadMapperEx.countsByDepotHead(type, subType, creatorArray, statusArray, number, linkNumber, beginTime, endTime, - materialParam, organId, creator, depotId, depotArray); + materialParam, organId, creator, depotId, depotArray, accountId, remark); }catch(Exception e){ JshException.readFail(logger, e); } @@ -720,8 +720,8 @@ public class DepotHeadService { if(StringUtil.isNotEmpty(depotHead.getAccountMoneyList())) { //校验多账户的结算金额 String accountMoneyList = depotHead.getAccountMoneyList().replace("[", "").replace("]", "").replaceAll("\"", ""); - int sum = StringUtil.getArrSum(accountMoneyList.split(",")); - BigDecimal manyAccountSum = BigDecimal.valueOf(sum).abs(); + BigDecimal sum = StringUtil.getArrSum(accountMoneyList.split(",")); + BigDecimal manyAccountSum = sum.abs(); if(manyAccountSum.compareTo(depotHead.getChangeAmount().abs())!=0) { throw new BusinessRunTimeException(ExceptionConstants.DEPOT_HEAD_MANY_ACCOUNT_FAILED_CODE, String.format(ExceptionConstants.DEPOT_HEAD_MANY_ACCOUNT_FAILED_MSG)); @@ -787,8 +787,8 @@ public class DepotHeadService { if(StringUtil.isNotEmpty(depotHead.getAccountMoneyList())) { //校验多账户的结算金额 String accountMoneyList = depotHead.getAccountMoneyList().replace("[", "").replace("]", "").replaceAll("\"", ""); - int sum = StringUtil.getArrSum(accountMoneyList.split(",")); - BigDecimal manyAccountSum = BigDecimal.valueOf(sum).abs(); + BigDecimal sum = StringUtil.getArrSum(accountMoneyList.split(",")); + BigDecimal manyAccountSum = sum.abs(); if(manyAccountSum.compareTo(depotHead.getChangeAmount().abs())!=0) { throw new BusinessRunTimeException(ExceptionConstants.DEPOT_HEAD_MANY_ACCOUNT_FAILED_CODE, String.format(ExceptionConstants.DEPOT_HEAD_MANY_ACCOUNT_FAILED_MSG)); diff --git a/jshERP-boot/src/main/resources/mapper_xml/AccountHeadMapperEx.xml b/jshERP-boot/src/main/resources/mapper_xml/AccountHeadMapperEx.xml index befeefa2..03683313 100644 --- a/jshERP-boot/src/main/resources/mapper_xml/AccountHeadMapperEx.xml +++ b/jshERP-boot/src/main/resources/mapper_xml/AccountHeadMapperEx.xml @@ -46,6 +46,16 @@ ) + + and ah.account_id=#{accountId} + + + and ah.status=#{status} + + + + and ah.remark like #{bindRemark} + and ifnull(ah.delete_flag,'0') !='1' order by ah.id desc @@ -88,6 +98,16 @@ ) + + and account_id=#{accountId} + + + and status=#{status} + + + + and remark like #{bindRemark} + and ifnull(delete_flag,'0') !='1' diff --git a/jshERP-boot/src/main/resources/mapper_xml/DepotHeadMapperEx.xml b/jshERP-boot/src/main/resources/mapper_xml/DepotHeadMapperEx.xml index cb84c641..873f2f3e 100644 --- a/jshERP-boot/src/main/resources/mapper_xml/DepotHeadMapperEx.xml +++ b/jshERP-boot/src/main/resources/mapper_xml/DepotHeadMapperEx.xml @@ -113,6 +113,14 @@ ) + + + and (dh.account_id=#{accountId} or dh.account_id_list like #{bindAccountId}) + + + + and dh.remark like #{bindRemark} + and ifnull(dh.delete_flag,'0') !='1' order by dh.id desc @@ -181,6 +189,14 @@ ) + + + and (dh.account_id=#{accountId} or dh.account_id_list like #{bindAccountId}) + + + + and dh.remark like #{bindRemark} + and ifnull(dh.delete_Flag,'0') !='1') tb