From 95d6cc34281f2cbfaffc429d56c42505a25b6ae8 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, 5 Aug 2022 00:15:29 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=99=E5=85=A5=E5=BA=93=E5=92=8C=E5=87=BA?= =?UTF-8?q?=E5=BA=93=E6=98=8E=E7=BB=86=E5=A2=9E=E5=8A=A0=E8=A7=92=E8=89=B2?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../erp/controller/DepotHeadController.java | 18 ++++++++---- .../datasource/mappers/DepotHeadMapperEx.java | 4 +++ .../service/depotHead/DepotHeadService.java | 25 +++++++++++------ .../mapper_xml/DepotHeadMapperEx.xml | 28 +++++++++++++++++++ 4 files changed, 60 insertions(+), 15 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 9bc0e16c..bf40175c 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(value = "depotId", required = false) Long depotId, @RequestParam("beginTime") String beginTime, @RequestParam("endTime") String endTime, + @RequestParam(value = "roleType", required = false) String roleType, @RequestParam("type") String type, @RequestParam("remark") String remark, HttpServletRequest request)throws Exception { @@ -126,11 +127,13 @@ public class DepotHeadController { } } List resList = new ArrayList(); + String [] creatorArray = depotHeadService.getCreatorArray(roleType); beginTime = Tools.parseDayToTime(beginTime, BusinessConstants.DAY_FIRST_TIME); endTime = Tools.parseDayToTime(endTime,BusinessConstants.DAY_LAST_TIME); - List list = depotHeadService.findByAll(beginTime, endTime, type, materialParam, - depotList, oId, number, remark, (currentPage-1)*pageSize, pageSize); - int total = depotHeadService.findByAllCount(beginTime, endTime, type, materialParam, depotList, oId, number, remark); + List list = depotHeadService.findByAll(beginTime, endTime, type, creatorArray, + materialParam, depotList, oId, number, remark, (currentPage-1)*pageSize, pageSize); + int total = depotHeadService.findByAllCount(beginTime, endTime, type, creatorArray, + materialParam, depotList, oId, number, remark); map.put("total", total); //存放数据json数组 if (null != list) { @@ -229,6 +232,7 @@ public class DepotHeadController { @RequestParam("beginTime") String beginTime, @RequestParam("endTime") String endTime, @RequestParam("subType") String subType, + @RequestParam(value = "roleType", required = false) String roleType, @RequestParam("remark") String remark, HttpServletRequest request)throws Exception { BaseResponseInfo res = new BaseResponseInfo(); @@ -256,11 +260,13 @@ public class DepotHeadController { depotFList.add(object.getLong("id")); } } + String [] creatorArray = depotHeadService.getCreatorArray(roleType); beginTime = Tools.parseDayToTime(beginTime, BusinessConstants.DAY_FIRST_TIME); endTime = Tools.parseDayToTime(endTime,BusinessConstants.DAY_LAST_TIME); - List list = depotHeadService.findAllocationDetail(beginTime, endTime, subType, number, materialParam, - depotList, depotFList, remark, (currentPage-1)*pageSize, pageSize); - int total = depotHeadService.findAllocationDetailCount(beginTime, endTime, subType, number, materialParam, depotList, depotFList, remark); + List list = depotHeadService.findAllocationDetail(beginTime, endTime, subType, number, + creatorArray, materialParam, depotList, depotFList, remark, (currentPage-1)*pageSize, pageSize); + int total = depotHeadService.findAllocationDetailCount(beginTime, endTime, subType, number, + creatorArray, materialParam, depotList, depotFList, remark); map.put("rows", list); map.put("total", total); res.code = 200; 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 909de650..842afece 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 @@ -63,6 +63,7 @@ public interface DepotHeadMapperEx { @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("type") String type, + @Param("creatorArray") String[] creatorArray, @Param("materialParam") String materialParam, @Param("depotList") List depotList, @Param("oId") Integer oId, @@ -75,6 +76,7 @@ public interface DepotHeadMapperEx { @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("type") String type, + @Param("creatorArray") String[] creatorArray, @Param("materialParam") String materialParam, @Param("depotList") List depotList, @Param("oId") Integer oId, @@ -104,6 +106,7 @@ public interface DepotHeadMapperEx { @Param("endTime") String endTime, @Param("subType") String subType, @Param("number") String number, + @Param("creatorArray") String[] creatorArray, @Param("materialParam") String materialParam, @Param("depotList") List depotList, @Param("depotFList") List depotFList, @@ -116,6 +119,7 @@ public interface DepotHeadMapperEx { @Param("endTime") String endTime, @Param("subType") String subType, @Param("number") String number, + @Param("creatorArray") String[] creatorArray, @Param("materialParam") String materialParam, @Param("depotList") List depotList, @Param("depotFList") List depotFList, 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 41143392..5164229e 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 @@ -447,21 +447,24 @@ public class DepotHeadService { return result; } - public List findByAll(String beginTime, String endTime, String type, String materialParam, - List depotList, Integer oId, String number, String remark, Integer offset, Integer rows) throws Exception{ + public List findByAll(String beginTime, String endTime, String type, String [] creatorArray, + String materialParam, List depotList, Integer oId, String number, + String remark, Integer offset, Integer rows) throws Exception{ List list = null; try{ - list =depotHeadMapperEx.findByAll(beginTime, endTime, type, materialParam, depotList, oId, number, remark, offset, rows); + list =depotHeadMapperEx.findByAll(beginTime, endTime, type, creatorArray, materialParam, depotList, oId, number, remark, offset, rows); }catch(Exception e){ JshException.readFail(logger, e); } return list; } - public int findByAllCount(String beginTime, String endTime, String type, String materialParam, List depotList, Integer oId, String number, String remark) throws Exception{ + public int findByAllCount(String beginTime, String endTime, String type, String [] creatorArray, + String materialParam, List depotList, Integer oId, String number, + String remark) throws Exception{ int result = 0; try{ - result =depotHeadMapperEx.findByAllCount(beginTime, endTime, type, materialParam, depotList, oId, number, remark); + result =depotHeadMapperEx.findByAllCount(beginTime, endTime, type, creatorArray, materialParam, depotList, oId, number, remark); }catch(Exception e){ JshException.readFail(logger, e); } @@ -490,10 +493,12 @@ public class DepotHeadService { } public List findAllocationDetail(String beginTime, String endTime, String subType, String number, - String materialParam, List depotList, List depotFList, String remark, Integer offset, Integer rows) throws Exception{ + String [] creatorArray, String materialParam, List depotList, List depotFList, + String remark, Integer offset, Integer rows) throws Exception{ List list = null; try{ - list =depotHeadMapperEx.findAllocationDetail(beginTime, endTime, subType, number, materialParam, depotList, depotFList, remark, offset, rows); + list =depotHeadMapperEx.findAllocationDetail(beginTime, endTime, subType, number, creatorArray, + materialParam, depotList, depotFList, remark, offset, rows); }catch(Exception e){ JshException.readFail(logger, e); } @@ -501,10 +506,12 @@ public class DepotHeadService { } public int findAllocationDetailCount(String beginTime, String endTime, String subType, String number, - String materialParam, List depotList, List depotFList, String remark) throws Exception{ + String [] creatorArray, String materialParam, List depotList, List depotFList, + String remark) throws Exception{ int result = 0; try{ - result =depotHeadMapperEx.findAllocationDetailCount(beginTime, endTime, subType, number, materialParam, depotList, depotFList, remark); + result =depotHeadMapperEx.findAllocationDetailCount(beginTime, endTime, subType, number, creatorArray, + materialParam, depotList, depotFList, 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 0803f3cb..8832ce9e 100644 --- a/jshERP-boot/src/main/resources/mapper_xml/DepotHeadMapperEx.xml +++ b/jshERP-boot/src/main/resources/mapper_xml/DepotHeadMapperEx.xml @@ -244,6 +244,13 @@ and dh.type=#{type} + + and dh.creator in ( + + #{creator} + + ) + and dh.number like #{bindNumber} @@ -285,6 +292,13 @@ and dh.type=#{type} + + and dh.creator in ( + + #{creator} + + ) + and dh.number like #{bindNumber} @@ -419,6 +433,13 @@ and dh.number like #{bindNumber} + + and dh.creator in ( + + #{creator} + + ) + and (me.bar_code like #{bindKey} or m.name like #{bindKey} or m.standard like #{bindKey} or m.model like #{bindKey} or dh.remark like #{bindKey}) @@ -461,6 +482,13 @@ and dh.number like #{bindNumber} + + and dh.creator in ( + + #{creator} + + ) + and (me.bar_code like #{bindKey} or m.name like #{bindKey} or m.standard like #{bindKey} or m.model like #{bindKey} or dh.remark like #{bindKey})