From f675672004af0ff9071d21546a0eee0a0c8f3092 Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: Fri, 29 Jan 2021 08:13:30 +0800
Subject: [PATCH] 增加部分搜索
---
src/main/java/com/nanometer/smartlab/api/ApiAction.java | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/api/ApiAction.java b/src/main/java/com/nanometer/smartlab/api/ApiAction.java
index 91c0c46..ab45bf4 100644
--- a/src/main/java/com/nanometer/smartlab/api/ApiAction.java
+++ b/src/main/java/com/nanometer/smartlab/api/ApiAction.java
@@ -567,7 +567,7 @@
logger.info("getUserInfo start...");
List<SysUser> userList = sysUserService.getSysUserInfoList(startTime, endTime);
- List<SysLaboratoryContainer> allLaboratoryContainerList = sysLaboratoryContainerService.getSysLaboratoryContainerList(null,null,null,null,null);
+ List<SysLaboratoryContainer> allLaboratoryContainerList = sysLaboratoryContainerService.getSysLaboratoryContainerList(null,null,null,null,null,null,null);
List<SysWarehouseContainer> allWarehouseContainerList = sysWarehouseContainerService.getSysWarehouseContainerList(null,null,null,null,null);
List<String> containerCodeList = new ArrayList<String>();
@@ -1400,6 +1400,7 @@
lr.setValidFlag(ValidFlag.VALID);
opeLaboratoryReserveService.insert(lr);
+ opeReagentStatus.setStatus(ArrivalStatus.NOREGISTER);
opeReagentStatus.setUserId(reagentReceiving.getApplyUserId());
opeReagentStatus.setHouseId(reagentReceiving.getLabId());
opeReagentStatus.setContainerId(reagentReceiving.getLabContainerId());
@@ -1439,7 +1440,7 @@
return ResponseModel.getErrInstance("账户名为空");
}
- HazardousWasteUser sysUser = sysUserService.getUserByAccount(account);
+ HazardousWasteUser sysUser = sysUserService.getUserByAccount(account,null);
if (sysUser == null){
return ResponseModel.getErrInstance("账户名不存在");
}else{
@@ -1540,8 +1541,8 @@
hazardousWaste.setTid(sdf.format(new Date()));
hazardousWaste.setCreateTime(new Date());
hazardousWaste.setStatus("待确认");
- HazardousWasteUser sysUser = sysUserService.getUserByAccount(hazardousWaste.getApplyPerson());
- hazardousWaste.setUnit( sysUser.getCompany());
+ HazardousWasteUser sysUser = sysUserService.getUserByAccount(null,hazardousWaste.getApplyPerson());
+ hazardousWaste.setUnit(sysUser.getCompany());
if (hazardousWaste.getAcid()== null){
hazardousWaste.setAcid(new BigDecimal(0));
}
--
Gitblit v1.9.2