From b48666e1f30b3334726d218d6b05d1228a307fd7 Mon Sep 17 00:00:00 2001
From: 李宇 <986321569@qq.com>
Date: 星期五, 25 六月 2021 18:11:06 +0800
Subject: [PATCH] 修改选中项
---
src/main/java/com/nanometer/smartlab/controller/OpeUseFlowInfoController.java | 76 ++++++++++++++++++++++++++++---------
1 files changed, 57 insertions(+), 19 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/controller/OpeUseFlowInfoController.java b/src/main/java/com/nanometer/smartlab/controller/OpeUseFlowInfoController.java
index 1df0b3a..2d8c5cb 100644
--- a/src/main/java/com/nanometer/smartlab/controller/OpeUseFlowInfoController.java
+++ b/src/main/java/com/nanometer/smartlab/controller/OpeUseFlowInfoController.java
@@ -7,8 +7,11 @@
import com.nanometer.smartlab.entity.SysUser;
import com.nanometer.smartlab.entity.dto.ApplyListDto;
+import com.nanometer.smartlab.exception.BusinessException;
import com.nanometer.smartlab.service.SysUserService;
+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;
@@ -72,6 +75,8 @@
private List<SysReagent> reagentSelectList;
+ private OpeUseFlow selectedOne;
+
public List<SysReagent> getReagentSelectList() {
if (this.reagentSelectList == null) {
this.initReagentSelectList();
@@ -105,6 +110,7 @@
if (count > 0) {
list = opeUseFlowService.getOpeUseFlowListByName(houseName,reagentId, reagentCode, containerCode,null, getUserId(),startDate,endDate, first, pageSize);
}
+ selectedOne = null;
} catch (Exception e) {
logger.error(e);
}
@@ -113,21 +119,20 @@
@Override
public OpeUseFlow getRowData(String rowKey) {
- Iterator<OpeUseFlow> iterator = this.iterator();
- OpeUseFlow temp = null;
- if(iterator!= null)
- {
- while(iterator.hasNext())
- {
- temp=iterator.next();
- if(rowKey.equals(temp.getId()))
- {
- return temp;
- }
- }
- }
-
- return temp;
+// Iterator<OpeUseFlow> iterator = this.iterator();
+// OpeUseFlow temp = null;
+// if(iterator!= null)
+// {
+// while(iterator.hasNext())
+// {
+// temp=iterator.next();
+// if(rowKey.equals(temp.getId()))
+// {
+// return temp;
+// }
+// }
+// }
+ return opeUseFlowService.selectById(rowKey);
}
};
}
@@ -166,14 +171,19 @@
List<ApplyListDto> applyList = new ArrayList<>();
//获取当时操作状态为领取的人员
Map<String,String> info= opeUseFlowService.getApplyUserByReagentCode(code);
- Map applyPersonInfo = sysUserService.getUser(info.get("user_id"));
+ SysUser applyPersonInfo = sysUserService.getUser(info.get("user_id"));
printTable.put("head", instituteName);
printTable.put("title", "领用单");
- printTable.put("applyPerson", applyPersonInfo.get("name"));
- printTable.put("department", applyPersonInfo.get("meta_value"));
+ printTable.put("applyPerson", applyPersonInfo.getName());
+ printTable.put("department", applyPersonInfo.getDepartment());
String time = new SimpleDateFormat("yyyy-MM-dd").format(info.get("create_time"));
printTable.put("date", time);
- printTable.put("phone", applyPersonInfo.get("phone"));
+ if (StringUtils.isNotBlank(applyPersonInfo.getPhone())){
+ printTable.put("phone", applyPersonInfo.getPhone());
+ }
+ if (StringUtils.isNotBlank(applyPersonInfo.getProject())){
+ printTable.put("project", applyPersonInfo.getProject());
+ }
printTable.put("receiptNumber", receiptNumber);
for (Map.Entry<String, Integer> map : printInfo.entrySet()) {
@@ -203,6 +213,26 @@
}else {
return startDate;
}
+ }
+
+ //报废试剂
+ public void scrapReagent(){
+ if (this.selectedOne == null) {
+ FacesUtils.warn("请选择");
+ return;
+ }
+ try {
+ String reagentCode = this.selectedOne.getReagentCode();
+ String reagentId = this.selectedOne.getReagent().getId();
+ opeUseFlowService.scrapReagent(reagentId, reagentCode, getUserId());
+ FacesUtils.warn("操作成功");
+ } catch (BusinessException e) {
+ FacesUtils.warn(e.getMessage());
+ } catch (Exception e) {
+ e.printStackTrace();
+ FacesUtils.warn("操作失败");
+ }
+
}
public void setStartDate(Date startDate) {
@@ -237,4 +267,12 @@
public void setContainerCode(String containerCode) {
this.containerCode = containerCode;
}
+
+ public OpeUseFlow getSelectedOne() {
+ return selectedOne;
+ }
+
+ public void setSelectedOne(OpeUseFlow selectedOne) {
+ this.selectedOne = selectedOne;
+ }
}
--
Gitblit v1.9.2