From df774e4fd262b0a39e52152f166ccddb2aa9f90e Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期日, 11 十月 2020 23:44:43 +0800
Subject: [PATCH] 优化代码

---
 java110-db/src/main/resources/mapper/community/RepairUserServiceDaoImplMapper.xml |   41 +++++++++++++++++++++++++++++------------
 1 files changed, 29 insertions(+), 12 deletions(-)

diff --git a/java110-db/src/main/resources/mapper/community/RepairUserServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/community/RepairUserServiceDaoImplMapper.xml
index 4a60ddc..5e76b20 100644
--- a/java110-db/src/main/resources/mapper/community/RepairUserServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/community/RepairUserServiceDaoImplMapper.xml
@@ -8,10 +8,10 @@
     <insert id="saveBusinessRepairUserInfo" parameterType="Map">
         insert into business_repair_user(
         operate,context,repair_id,ru_id,state,community_id,b_id,staff_id,staff_name,pre_staff_id,
-        pre_staff_name,repair_event
+        pre_staff_name,repair_event,end_time,start_time
         ) values (
         #{operate},#{context},#{repairId},#{ruId},#{state},#{communityId},#{bId},#{staffId},
-        #{staffName},#{preStaffId},#{preStaffName},#{repairEvent}
+        #{staffName},#{preStaffId},#{preStaffName},#{repairEvent},#{endTime},#{startTime}
         )
     </insert>
 
@@ -55,9 +55,9 @@
     <insert id="saveRepairUserInfoInstance" parameterType="Map">
         insert into r_repair_user(
         context,repair_id,status_cd,ru_id,state,community_id,b_id,staff_id,staff_name,pre_staff_id,
-        pre_staff_name,repair_event,start_time,end_time,repair_event
+        pre_staff_name,repair_event,start_time,end_time
         ) select t.context,t.repair_id,'0',t.ru_id,t.state,t.community_id,t.b_id,t.staff_id,t.staff_name,
-        t.pre_staff_id,t.pre_staff_name,t.repair_event,t.start_time,t.end_time,t.repair_event
+        t.pre_staff_id,t.pre_staff_name,t.repair_event,t.start_time,t.end_time
         from business_repair_user t
         where 1=1
         and t.operate= 'ADD'
@@ -118,6 +118,13 @@
         <if test="state !=null and state != ''">
             and t.state= #{state}
         </if>
+
+        <if test="states !=null ">
+            and t.state in
+            <foreach collection="states" item="item" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
         <if test="communityId !=null and communityId != ''">
             and t.community_id= #{communityId}
         </if>
@@ -133,7 +140,7 @@
         <if test="preStaffId !=null and preStaffId != ''">
             and t.pre_staff_id= #{preStaffId}
         </if>
-        order by t.create_time desc
+        order by t.start_time
         <if test="page != -1 and page != null ">
             limit #{page}, #{row}
         </if>
@@ -150,18 +157,14 @@
         <if test="context !=null and context != ''">
             , t.context= #{context}
         </if>
-        <if test="repairId !=null and repairId != ''">
-            , t.repair_id= #{repairId}
-        </if>
+
         <if test="state !=null and state != ''">
             , t.state= #{state}
         </if>
         <if test="communityId !=null and communityId != ''">
             , t.community_id= #{communityId}
         </if>
-        <if test="staffId !=null and staffId != ''">
-            , t.staff_id= #{staffId}
-        </if>
+
         <if test="end_time !=null ">
             , t.end_time= #{end_time}
         </if>
@@ -173,6 +176,15 @@
         <if test="bId !=null and bId != ''">
             and t.b_id= #{bId}
         </if>
+<!--        <if test="state !=null and state != ''">-->
+<!--            and t.state= #{state}-->
+<!--        </if>-->
+        <if test="staffId !=null and staffId != ''">
+            and t.staff_id= #{staffId}
+        </if>
+        <if test="repairId !=null and repairId != ''">
+            and t.repair_id= #{repairId}
+        </if>
 
     </update>
 
@@ -180,7 +192,6 @@
     <select id="queryRepairUsersCount" parameterType="Map" resultType="Map">
         select count(1) count
         from r_repair_user t
-        where 1 =1
         left join t_dict d on t.state = d.status_cd and d.table_name = 'r_repair_user' and d.table_columns = 'state'
         where 1 =1
         <if test="context !=null and context != ''">
@@ -204,6 +215,12 @@
         <if test="state !=null and state != ''">
             and t.state= #{state}
         </if>
+        <if test="states !=null ">
+            and t.state in
+            <foreach collection="states" item="item" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
         <if test="communityId !=null and communityId != ''">
             and t.community_id= #{communityId}
         </if>

--
Gitblit v1.8.0