From b7735518ee19f52e6fbc5ae5f047f916ec5bddee Mon Sep 17 00:00:00 2001
From: 李宇 <986321569@qq.com>
Date: 星期五, 18 六月 2021 17:10:57 +0800
Subject: [PATCH] 修改按钮权限、删除实验室时同时删除存储柜、添加存储柜时条码你不能重复
---
src/main/java/com/nanometer/smartlab/controller/HazardousWasteController.java | 51 ++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 50 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/controller/HazardousWasteController.java b/src/main/java/com/nanometer/smartlab/controller/HazardousWasteController.java
index df1eaf8..937d179 100644
--- a/src/main/java/com/nanometer/smartlab/controller/HazardousWasteController.java
+++ b/src/main/java/com/nanometer/smartlab/controller/HazardousWasteController.java
@@ -36,6 +36,7 @@
private boolean isSearch = false;
private boolean isAnalysSearch = false;
private LazyDataModel<HazardousWaste> analysisDataModel;
+ private HazardousWaste selectedOne;
@Resource
private HazardousWasteService hazardousWasteService;
@@ -207,8 +208,9 @@
statusList = new ArrayList<> ();
statusList.add("全部");
statusList.add("待确认");
- statusList.add("已解决");
+ statusList.add("已确认");
statusList.add("已拒绝");
+ statusList.add("已取消");
return statusList;
}
@@ -241,6 +243,45 @@
}
}
+ public void cancelOne(){
+ //待确认状态的才能取消
+ if (this.selectedOne == null) {
+ FacesUtils.warn("请选择");
+ return;
+ }
+ if (!"待确认".equals(this.selectedOne.getStatus())) {
+ FacesUtils.warn("非待确认不能取消");
+ return;
+ }
+ try {
+ this.selectedOne.setStatus("已取消");
+ hazardousWasteService.updateWaste(this.selectedOne);
+ FacesUtils.warn("操作成功");
+ } catch (Exception e) {
+ e.printStackTrace();
+ FacesUtils.warn("操作失败");
+ }
+ }
+
+ public void recoverOne(){
+ if (this.selectedOne == null) {
+ FacesUtils.warn("请选择");
+ return;
+ }
+ if (!"已取消".equals(this.selectedOne.getStatus())) {
+ FacesUtils.warn("非已取消不能恢复");
+ return;
+ }
+ try {
+ this.selectedOne.setStatus("待确认");
+ hazardousWasteService.updateWaste(this.selectedOne);
+ FacesUtils.warn("操作成功");
+ } catch (Exception e) {
+ e.printStackTrace();
+ FacesUtils.warn("操作失败");
+ }
+ }
+
public String getTid() {
return tid;
}
@@ -248,4 +289,12 @@
public void setTid(String tid) {
this.tid = tid;
}
+
+ public HazardousWaste getSelectedOne() {
+ return selectedOne;
+ }
+
+ public void setSelectedOne(HazardousWaste selectedOne) {
+ this.selectedOne = selectedOne;
+ }
}
--
Gitblit v1.9.2