From 47a751cb301d05276ae5d75145d57b2d090fe4e1 Mon Sep 17 00:00:00 2001
From: kongzy <kongzy>
Date: 星期一, 01 七月 2024 10:58:35 +0800
Subject: [PATCH] change
---
src/main/java/com/nanometer/smartlab/controller/PersonalUseInfoController.java | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/controller/PersonalUseInfoController.java b/src/main/java/com/nanometer/smartlab/controller/PersonalUseInfoController.java
index 91bfc1b..0547cd1 100644
--- a/src/main/java/com/nanometer/smartlab/controller/PersonalUseInfoController.java
+++ b/src/main/java/com/nanometer/smartlab/controller/PersonalUseInfoController.java
@@ -13,6 +13,7 @@
import com.nanometer.smartlab.service.SysLaboratoryService;
import com.nanometer.smartlab.util.FacesUtils;
import com.nanometer.smartlab.util.Utils;
+import org.apache.commons.lang.StringUtils;
import org.apache.log4j.Logger;
import org.primefaces.context.RequestContext;
import org.primefaces.model.LazyDataModel;
@@ -54,7 +55,7 @@
* 数据源
*/
private LazyDataModel<OpeReagentStatus> dataModel;
- private String reagentId;
+ private Long reagentId;
private String reagentName;
private String reagentCode;
private String applyPerson;
@@ -126,7 +127,7 @@
//判断单子下的试剂是否全部 为 领用待入库-1,不是就不能取消领用
List<PersonUseDetail> applyList = opeUseFlowService.getApplyInfo(selectOne.getReceiptNumber());
boolean flag = applyList.stream().allMatch(pu ->
- opeReagentStatusService.getOpeReagentStatusByReagentCode(pu.getReagentCode() ).getStatus()== ArrivalStatus.NOREGISTER);
+ opeReagentStatusService.getOpeReagentStatusByReagentCode(pu.getReagentCode() ).getStatus()== ArrivalStatus.NOREGISTER.getKey());
if (!flag) {
FacesUtils.warn("试剂当前状态不可以取消领用");
return;
@@ -165,9 +166,9 @@
printTable.put("department", selectOne.getDepartment());
SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
printTable.put("date", dateFormat.format(selectOne.getCreateTime()));
- printTable.put("phone", selectOne.getPhone());
+ printTable.put("phone", StringUtils.isBlank(selectOne.getPhone())?"":selectOne.getPhone());
printTable.put("receiptNumber", selectOne.getReceiptNumber());
- printTable.put("project", selectOne.getProject());
+ printTable.put("project", selectOne.getProjectName());
SysLaboratory sysLaboratory = sysLaboratoryService.getSysLaboratorySimpleInfo(selectOne.getHouseId());
printTable.put("lab", sysLaboratory.getName());
@@ -317,11 +318,11 @@
return dataModel2;
}
- public String getReagentId() {
+ public Long getReagentId() {
return reagentId;
}
- public void setReagentId(String reagentId) {
+ public void setReagentId(Long reagentId) {
this.reagentId = reagentId;
}
--
Gitblit v1.9.2