From ad2f00d48ac45030ed26dcb37445585e2d3e94f8 Mon Sep 17 00:00:00 2001
From: lyfO_o <764716047@qq.com>
Date: Thu, 30 Dec 2021 13:07:40 +0800
Subject: [PATCH] bug
---
src/main/java/com/nanometer/smartlab/service/OpeApplyServiceImpl.java | 41 +++++++++++++++++++++++++++++++++++++++--
1 files changed, 39 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/service/OpeApplyServiceImpl.java b/src/main/java/com/nanometer/smartlab/service/OpeApplyServiceImpl.java
index 23bfaf4..a576af3 100644
--- a/src/main/java/com/nanometer/smartlab/service/OpeApplyServiceImpl.java
+++ b/src/main/java/com/nanometer/smartlab/service/OpeApplyServiceImpl.java
@@ -67,6 +67,8 @@
SysSequenceService sysSequenceService;
@Resource
private SysUserService sysUserService;
+ @Resource
+ private BaseMetaService baseMetaService;
@Transactional(propagation = Propagation.REQUIRED)
public List<OpeApply> getOpeApplyList(String reagentName, Timestamp startDeadline, String controlProduct,Timestamp endDeadline, Integer status,
@@ -560,7 +562,7 @@
params.put("productSn",productSn);
params.put("applyCode",applyCode);
if (isExpired) {
- params.put("status",ApplyStatus.EXPIRED);
+ params.put("status",ApplyStatus.EXPIRED.getKey());
}else{
params.put("status", status);
}
@@ -585,7 +587,7 @@
params.put("productSn",productSn);
params.put("applyCode",applyCode);
if (isExpired) {
- params.put("status",ApplyStatus.EXPIRED);
+ params.put("status",ApplyStatus.EXPIRED.getKey());
}else{
params.put("status", status);
}
@@ -888,4 +890,39 @@
return opeApplyDao.getOpeApplyReserveListByNameForRowData(rowKey);
}
+ @Override
+ public int getOpeApplySupplerRequireMngTotalCount(SysUser user,String reagentName, Timestamp startDeadline, Timestamp endDeadline, int status, byte isShow) {
+ Map<String, Object> params = new HashMap<>();
+ params.put("reagentName",reagentName );
+ params.put("startDeadline", startDeadline);
+ params.put("endDeadline", endDeadline);
+ params.put("status", status);
+ params.put("isShow", isShow);
+ //看到供应商是自己的单位的数据
+ String company = baseMetaService.getBaseMetaValue(user.getCompany());
+ if (user.getSeeFlag().getKey() != SeeFlag.MANAGE.getKey()
+ && user.getSeeFlag().getKey() != SeeFlag.LEADING.getKey()) {
+ params.put("company", company);
+ }
+ return this.opeApplyDao.getOpeApplySupplerRequireMngTotalCount(params);
+ }
+
+ @Override
+ public List<OpeApply> getOpeApplySupplerRequireMngList(SysUser user,String reagentName, Timestamp startDeadline, Timestamp endDeadline, int status, int first, int pageSize, byte isShow) {
+ Map<String, Object> params = new HashMap<>();
+ params.put("reagentName", reagentName);
+ params.put("startDeadline", startDeadline);
+ params.put("endDeadline", endDeadline);
+ params.put("status", status);
+ params.put("isShow", isShow);
+ //看到供应商是自己的单位的数据
+ String company = baseMetaService.getBaseMetaValue(user.getCompany());
+ if (user.getSeeFlag().getKey() != SeeFlag.MANAGE.getKey()
+ && user.getSeeFlag().getKey() != SeeFlag.LEADING.getKey()) {
+ params.put("company", company);
+ }
+
+ return this.opeApplyDao.getOpeApplySupplerRequireMngList(params);
+ }
+
}
--
Gitblit v1.9.2