From 1e90eceefceef5ea5c637785235bc587cf41e4c9 Mon Sep 17 00:00:00 2001
From: lyfO_o <764716047@qq.com>
Date: 星期四, 21 十月 2021 09:40:50 +0800
Subject: [PATCH] 模块:api接口 修改:发送实验室负责人改为实验室下课题组下的所有实验室负责人 提:秦老师
---
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