From 43ee95fbdcb6fe0a9d548d0935c23c232d5ffeaa Mon Sep 17 00:00:00 2001
From: 李宇 <986321569@qq.com>
Date: Fri, 12 Nov 2021 12:49:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/com/nanometer/smartlab/dao/HazardousWasteMapper.xml |   52 +++++++++++++++++++++++++++++++++++++---------------
 1 files changed, 37 insertions(+), 15 deletions(-)

diff --git a/src/main/java/com/nanometer/smartlab/dao/HazardousWasteMapper.xml b/src/main/java/com/nanometer/smartlab/dao/HazardousWasteMapper.xml
index b6b49f4..b5a4509 100644
--- a/src/main/java/com/nanometer/smartlab/dao/HazardousWasteMapper.xml
+++ b/src/main/java/com/nanometer/smartlab/dao/HazardousWasteMapper.xml
@@ -226,17 +226,37 @@
       updatetime = #{updatetime,jdbcType=TIMESTAMP}
     where id = #{id,jdbcType=BIGINT}
   </update>
-  <select id="setAllWasters" resultMap="BaseResultMap">
+  <select id="setAllWasterCount" resultType="com.nanometer.smartlab.entity.HazardousWaste">
+    select
+    sum(acid) as acid,sum(alkali) as alkali, sum(organic) as organic,sum(solid) as solid,sum(medical) as medical
+    from sys_hazardous_waste
+    <where>
+      1 = 1
+      <if test="starttime != null and starttime != ''">
+        and create_time &gt;= #{starttime}
+      </if>
+      <if test="endtime != null and endtime != ''">
+        and create_time &lt;= #{endtime}
+      </if>
+      <if test="status != null and status != ''">
+        and status = #{status}
+      </if>
+      <if test="applyPerson != null and applyPerson != ''">
+        and apply_person = #{applyPerson}
+      </if>
+    </where>
+  </select>
+    <select id="setAllWasters" resultMap="BaseResultMap">
     select
     <include refid="Base_Column_List" />
     from sys_hazardous_waste
     <where>
       1 = 1
       <if test="starttime != null and starttime != ''">
-        and create_time &gt; #{starttime}
+        and create_time &gt;= #{starttime}
       </if>
       <if test="endtime != null and endtime != ''">
-        and create_time &lt; #{endtime}
+        and create_time &lt;= #{endtime}
       </if>
       <if test="status != null and status != ''">
         and status = #{status}
@@ -255,10 +275,10 @@
     <where>
       1 = 1
       <if test="startTime != null and startTime != ''">
-        and create_time &gt; #{startTime}
+        and create_time &gt;= #{startTime}
       </if>
       <if test="endTime != null and endTime != ''">
-        and create_time &lt; #{endTime}
+        and create_time &lt;= #{endTime}
       </if>
       <if test="status != null and status != ''">
         and status = #{status}
@@ -289,10 +309,10 @@
     <where>
       1 = 1
       <if test="startTime != null and startTime != ''">
-        and create_time &gt; #{startTime}
+        and create_time &gt;= #{startTime}
       </if>
       <if test="endTime != null and endTime != ''">
-        and create_time &lt; #{endTime}
+        and create_time &lt;= #{endTime}
       </if>
       <if test="status != null and status != ''">
         and status = #{status}
@@ -319,10 +339,10 @@
     <where>
       1 = 1
       <if test="startTime != null and startTime != ''">
-        and create_time &gt; #{startTime}
+        and create_time &gt;= #{startTime}
       </if>
       <if test="endTime != null and endTime != ''">
-        and create_time &lt; #{endTime}
+        and create_time &lt;= #{endTime}
       </if>
       <if test="status != null and status != ''">
         and status = #{status}
@@ -343,15 +363,16 @@
     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>
       1 = 1
       <if test="startTime != null and startTime != ''">
-        and create_time &gt; #{startTime}
+        and create_time &gt;= #{startTime}
       </if>
       <if test="endTime != null and endTime != ''">
-        and create_time &lt; #{endTime}
+        and create_time &lt;= #{endTime}
       </if>
       <if test="status != null and status != ''">
         and status = #{status}
@@ -367,6 +388,7 @@
       </if>
       group by project,department,unit
     </where>
+    ) shw
   </select>
   <select id="selectStatistics" resultType="com.nanometer.smartlab.entity.HazardousWaste">
     select
@@ -376,10 +398,10 @@
     <where>
       1 = 1
       <if test="startTime != null and startTime != ''">
-        and create_time &gt; #{startTime}
+        and create_time &gt;= #{startTime}
       </if>
       <if test="endTime != null and endTime != ''">
-        and create_time &lt; #{endTime}
+        and create_time &lt;= #{endTime}
       </if>
       <if test="status != null and status != ''">
         and status = #{status}
@@ -408,10 +430,10 @@
     <where>
       1 = 1
       <if test="startTime != null and startTime != ''">
-        and create_time &gt; #{startTime}
+        and create_time &gt;= #{startTime}
       </if>
       <if test="endTime != null and endTime != ''">
-        and create_time &lt; #{endTime}
+        and create_time &lt;= #{endTime}
       </if>
       <if test="status != null and status != ''">
         and status = #{status}

--
Gitblit v1.9.2