purovps/jshERP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

给采购销售统计和出入库汇总接口增加数据角色类型参数

Browse Source
This commit is contained in:
季圣华
2022-08-08 23:55:56 +08:00
parent 9a496ffa87
commit f89a9c006a
8 changed files with 97 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
jshERP-boot/src/main/java/com/jsh/erp/controller/DepotHeadController.java
View File

@@ -51,12 +51,6 @@ public class DepotHeadController {
@Resource
private DepotHeadService depotHeadService;
@Resource
private AccountHeadService accountHeadService;
@Resource
private SupplierService supplierService;
@Resource
private DepotService depotService;
@@ -175,6 +169,7 @@ public class DepotHeadController {
@RequestParam("beginTime") String beginTime,
@RequestParam("endTime") String endTime,
@RequestParam("type") String type,
@RequestParam(value = "roleType", required = false) String roleType,
HttpServletRequest request)throws Exception {
BaseResponseInfo res = new BaseResponseInfo();
Map<String, Object> map = new HashMap<String, Object>();
@@ -193,8 +188,9 @@ public class DepotHeadController {
beginTime = Tools.parseDayToTime(beginTime,BusinessConstants.DAY_FIRST_TIME);
endTime = Tools.parseDayToTime(endTime,BusinessConstants.DAY_LAST_TIME);
List<DepotHeadVo4InOutMCount> list = depotHeadService.findInOutMaterialCount(beginTime, endTime, type, StringUtil.toNull(materialParam),
depotList, oId, (currentPage-1)*pageSize, pageSize);
int total = depotHeadService.findInOutMaterialCountTotal(beginTime, endTime, type, StringUtil.toNull(materialParam), depotList, oId);
depotList, oId, roleType, (currentPage-1)*pageSize, pageSize);
int total = depotHeadService.findInOutMaterialCountTotal(beginTime, endTime, type, StringUtil.toNull(materialParam),
depotList, oId, roleType);
map.put("total", total);
map.put("rows", list);
res.code = 200;