From ef0487dc7bee47a60f4894ec49fa5b1e83b829b9 Mon Sep 17 00:00:00 2001
From: 李宇 <986321569@qq.com>
Date: 星期三, 16 六月 2021 08:43:14 +0800
Subject: [PATCH] 修改危废
---
src/main/java/com/nanometer/smartlab/entity/HazardousWaste.java | 6 +++---
src/main/java/com/nanometer/smartlab/controller/HazardousWasteController.java | 2 +-
src/main/java/com/nanometer/smartlab/dao/HazardousWasteMapper.xml | 2 ++
3 files changed, 6 insertions(+), 4 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..234741e 100644
--- a/src/main/java/com/nanometer/smartlab/controller/HazardousWasteController.java
+++ b/src/main/java/com/nanometer/smartlab/controller/HazardousWasteController.java
@@ -207,7 +207,7 @@
statusList = new ArrayList<> ();
statusList.add("全部");
statusList.add("待确认");
- statusList.add("已解决");
+ statusList.add("已确认");
statusList.add("已拒绝");
return statusList;
}
diff --git a/src/main/java/com/nanometer/smartlab/dao/HazardousWasteMapper.xml b/src/main/java/com/nanometer/smartlab/dao/HazardousWasteMapper.xml
index 1d5b686..b5a4509 100644
--- a/src/main/java/com/nanometer/smartlab/dao/HazardousWasteMapper.xml
+++ b/src/main/java/com/nanometer/smartlab/dao/HazardousWasteMapper.xml
@@ -363,6 +363,7 @@
order by create_time desc
</select>
<select id="countStatistics" resultType="java.lang.Integer">
+ select count(0) from(
select count(0)
from sys_hazardous_waste
<where>
@@ -387,6 +388,7 @@
</if>
group by project,department,unit
</where>
+ ) shw
</select>
<select id="selectStatistics" resultType="com.nanometer.smartlab.entity.HazardousWaste">
select
diff --git a/src/main/java/com/nanometer/smartlab/entity/HazardousWaste.java b/src/main/java/com/nanometer/smartlab/entity/HazardousWaste.java
index 17473d0..61d5995 100644
--- a/src/main/java/com/nanometer/smartlab/entity/HazardousWaste.java
+++ b/src/main/java/com/nanometer/smartlab/entity/HazardousWaste.java
@@ -41,7 +41,7 @@
/** 单号 tid **/
private String tid;
- /** 状态 待解决、已解决、已拒绝 status **/
+ /** 状态 待解决、已确认、已拒绝 status **/
private String status;
/** 创建者 creator **/
@@ -173,12 +173,12 @@
this.tid = tid == null ? null : tid.trim();
}
- /** 状态 待解决、已解决、已拒绝 status **/
+ /** 状态 待解决、已确认、已拒绝 status **/
public String getStatus() {
return status;
}
- /** 状态 待解决、已解决、已拒绝 status **/
+ /** 状态 待解决、已确认、已拒绝 status **/
public void setStatus(String status) {
this.status = status == null ? null : status.trim();
}
--
Gitblit v1.9.2