From 648449c0dc1db4531889a4689d45f0a442032d3a Mon Sep 17 00:00:00 2001 From: 李宇 <986321569@qq.com> Date: 星期二, 26 十月 2021 17:05:35 +0800 Subject: [PATCH] 申购管理的审批者--》如果申购人有课题组查到的审批者为申购人所在部门+所在课题组+是审批者+人员有效的以及申购人所在部门+无课题组+是审批者+人员有效的。如果申购人没有课题组查到的是申购人所在部门+是审批者+人员有效的 --- src/main/java/com/nanometer/smartlab/service/OpeApplyServiceImpl.java | 14 +++++++++----- 1 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/nanometer/smartlab/service/OpeApplyServiceImpl.java b/src/main/java/com/nanometer/smartlab/service/OpeApplyServiceImpl.java index fed8f2c..23bfaf4 100644 --- a/src/main/java/com/nanometer/smartlab/service/OpeApplyServiceImpl.java +++ b/src/main/java/com/nanometer/smartlab/service/OpeApplyServiceImpl.java @@ -69,9 +69,9 @@ private SysUserService sysUserService; @Transactional(propagation = Propagation.REQUIRED) - public List<OpeApply> getOpeApplyList(String reagentName, Timestamp startDeadline, Timestamp endDeadline, Integer status, + public List<OpeApply> getOpeApplyList(String reagentName, Timestamp startDeadline, String controlProduct,Timestamp endDeadline, Integer status, String applyUserId, String approveUserId, String queryCas, - Integer first, Integer pageSize,String applyCode,String applyUserName) { + Integer first, Integer pageSize,String applyCode,String applyUserName,Byte isShow) { try { Map<String, Object> params = new HashMap<String, Object>(); if (StringUtils.isNotBlank(reagentName)) { @@ -80,6 +80,8 @@ params.put("startDeadline", startDeadline); params.put("endDeadline", endDeadline); params.put("status", status); + params.put("isShow", isShow); + params.put("controlProduct", controlProduct); if (StringUtils.isNotBlank(applyUserId)) { SysUser sysUser = sysUserService.getSysUser(applyUserId); @@ -191,8 +193,8 @@ } @Transactional(propagation = Propagation.REQUIRED) - public int getOpeApplyTotalCount(String reagentName, Timestamp startDeadline, Timestamp endDeadline, Integer status, - String applyUserId, String approveUserId, String queryCas,String applyCode,String applyUserName) { + public int getOpeApplyTotalCount(String reagentName, Timestamp startDeadline,String controlProduct, Timestamp endDeadline, Integer status, + String applyUserId, String approveUserId, String queryCas,String applyCode,String applyUserName,Byte isShow) { try { Map<String, Object> params = new HashMap<String, Object>(); if (StringUtils.isNotBlank(reagentName)) { @@ -201,6 +203,8 @@ params.put("startDeadline", startDeadline); params.put("endDeadline", endDeadline); params.put("status", status); + params.put("isShow", isShow); + params.put("controlProduct", controlProduct); if (StringUtils.isNotBlank(applyUserId)) { SysUser sysUser = sysUserService.getSysUser(applyUserId); @@ -863,7 +867,7 @@ //申购数量 opeApply.setNum(num); //申购人 - opeApply.setApplyUserId(user.getId()); + opeApply.setApplyUserId(applyUser.getId()); //选择的审批人 opeApply.setApproveUserId(approveUser.getId()); //选择的课题组信息 -- Gitblit v1.9.2