From 8111729fd8e2cc86257be9a810cf6a0acc2cdb4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com> Date: Fri, 23 Jun 2023 17:32:20 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=99=E5=85=A5=E5=BA=93=E6=98=8E=E7=BB=86?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=93=8D=E4=BD=9C=E4=BA=BA=E7=9A=84=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jsh/erp/controller/DepotHeadController.java | 5 +++-- .../jsh/erp/datasource/mappers/DepotHeadMapperEx.java | 2 ++ .../jsh/erp/service/depotHead/DepotHeadService.java | 10 ++++++---- .../main/resources/mapper_xml/DepotHeadMapperEx.xml | 6 ++++++ 4 files changed, 17 insertions(+), 6 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 0a4fba87..feb46461 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 @@ -108,6 +108,7 @@ public class DepotHeadController { @RequestParam("endTime") String endTime, @RequestParam(value = "roleType", required = false) String roleType, @RequestParam("type") String type, + @RequestParam("creator") Long creator, @RequestParam("remark") String remark, HttpServletRequest request)throws Exception { BaseResponseInfo res = new BaseResponseInfo(); @@ -132,9 +133,9 @@ public class DepotHeadController { endTime = Tools.parseDayToTime(endTime,BusinessConstants.DAY_LAST_TIME); Boolean forceFlag = systemConfigService.getForceApprovalFlag(); List list = depotHeadService.findInOutDetail(beginTime, endTime, type, creatorArray, organArray, forceFlag, - StringUtil.toNull(materialParam), depotList, oId, StringUtil.toNull(number), remark, (currentPage-1)*pageSize, pageSize); + StringUtil.toNull(materialParam), depotList, oId, StringUtil.toNull(number), creator, remark, (currentPage-1)*pageSize, pageSize); int total = depotHeadService.findInOutDetailCount(beginTime, endTime, type, creatorArray, organArray, forceFlag, - StringUtil.toNull(materialParam), depotList, oId, StringUtil.toNull(number), remark); + StringUtil.toNull(materialParam), depotList, oId, StringUtil.toNull(number), creator, remark); map.put("total", total); //存放数据json数组 if (null != list) { 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 5173223d..2a7547ab 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 @@ -74,6 +74,7 @@ public interface DepotHeadMapperEx { @Param("depotList") List depotList, @Param("oId") Integer oId, @Param("number") String number, + @Param("creator") Long creator, @Param("remark") String remark, @Param("offset") Integer offset, @Param("rows") Integer rows); @@ -89,6 +90,7 @@ public interface DepotHeadMapperEx { @Param("depotList") List depotList, @Param("oId") Integer oId, @Param("number") String number, + @Param("creator") Long creator, @Param("remark") String remark); List findInOutMaterialCount( 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 ee97c2e7..b0999cdb 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 @@ -624,10 +624,11 @@ public class DepotHeadService { public List findInOutDetail(String beginTime, String endTime, String type, String [] creatorArray, String [] organArray, Boolean forceFlag, String materialParam, List depotList, Integer oId, String number, - String remark, Integer offset, Integer rows) throws Exception{ + Long creator, String remark, Integer offset, Integer rows) throws Exception{ List list = null; try{ - list =depotHeadMapperEx.findInOutDetail(beginTime, endTime, type, creatorArray, organArray, forceFlag, materialParam, depotList, oId, number, remark, offset, rows); + list =depotHeadMapperEx.findInOutDetail(beginTime, endTime, type, creatorArray, organArray, forceFlag, + materialParam, depotList, oId, number, creator, remark, offset, rows); }catch(Exception e){ JshException.readFail(logger, e); } @@ -636,10 +637,11 @@ public class DepotHeadService { public int findInOutDetailCount(String beginTime, String endTime, String type, String [] creatorArray, String [] organArray, Boolean forceFlag, String materialParam, List depotList, Integer oId, String number, - String remark) throws Exception{ + Long creator, String remark) throws Exception{ int result = 0; try{ - result =depotHeadMapperEx.findInOutDetailCount(beginTime, endTime, type, creatorArray, organArray, forceFlag, materialParam, depotList, oId, number, remark); + result =depotHeadMapperEx.findInOutDetailCount(beginTime, endTime, type, creatorArray, organArray, forceFlag, + materialParam, depotList, oId, number, creator, 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 67604795..89cb66f6 100644 --- a/jshERP-boot/src/main/resources/mapper_xml/DepotHeadMapperEx.xml +++ b/jshERP-boot/src/main/resources/mapper_xml/DepotHeadMapperEx.xml @@ -324,6 +324,9 @@ and (me.bar_code like #{bindKey} or m.name like #{bindKey} or m.standard like #{bindKey} or m.model like #{bindKey}) + + and dh.creator=#{creator} + and (dh.remark like #{bindRemark} or di.remark like #{bindRemark}) @@ -382,6 +385,9 @@ and (me.bar_code like #{bindKey} or m.name like #{bindKey} or m.standard like #{bindKey} or m.model like #{bindKey}) + + and dh.creator=#{creator} + and (dh.remark like #{bindRemark} or di.remark like #{bindRemark})