From f14c50cb0036d3ddd655ce4e34732ba396a836c4 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 30 五月 2023 12:42:03 +0800
Subject: [PATCH] optimize 统计

---
 java110-db/src/main/resources/mapper/community/RoomRenovationServiceDaoImplMapper.xml |   69 +++++++++++++++++++++++++++++++---
 1 files changed, 63 insertions(+), 6 deletions(-)

diff --git a/java110-db/src/main/resources/mapper/community/RoomRenovationServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/community/RoomRenovationServiceDaoImplMapper.xml
index b392066..24d7c28 100755
--- a/java110-db/src/main/resources/mapper/community/RoomRenovationServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/community/RoomRenovationServiceDaoImplMapper.xml
@@ -6,11 +6,12 @@
 
     <!-- 淇濆瓨瑁呬慨鐢宠淇℃伅 add by wuxw 2018-07-03 -->
     <insert id="saveRoomRenovationInfo" parameterType="Map">
-        insert into room_renovation(
-        remark,is_violation,r_id,room_id,room_name,person_name,violation_desc,start_time,end_time,state,community_id,person_tel
-        ) values (
-        #{remark},#{isViolation},#{rId},#{roomId},#{roomName},#{personName},#{violationDesc},#{startTime},#{endTime},#{state},#{communityId},#{personTel}
-        )
+        insert into room_renovation(remark, is_violation, r_id, room_id, room_name, person_name, violation_desc,
+                                    start_time, end_time, state, community_id, person_tel, is_postpone, postpone_time,
+                                    renovation_company, person_main, person_main_tel)
+        values (#{remark}, #{isViolation}, #{rId}, #{roomId}, #{roomName}, #{personName}, #{violationDesc},
+                #{startTime}, #{endTime}, #{state}, #{communityId}, #{personTel}, #{isPostpone}, #{postponeTime},
+                #{renovationCompany}, #{personMain}, #{personMainTel})
     </insert>
 
     <!-- 鏌ヨ瑁呬慨鐢宠淇℃伅 add by wuxw 2018-07-03 -->
@@ -19,7 +20,10 @@
         rId,t.room_id,t.room_id roomId,t.room_name,t.room_name roomName,t.person_name,t.person_name
         personName,t.violation_desc,t.violation_desc violationDesc,t.start_time,t.start_time
         startTime,t.end_time,t.end_time endTime,t.state,td.name stateName,t.community_id,t.community_id
-        communityId,t.person_tel,t.person_tel personTel,t.create_time createTime
+        communityId,t.person_tel,t.person_tel personTel,t.create_time createTime,t.is_postpone,t.is_postpone
+        isPostpone,t.postpone_time,t.postpone_time postponeTime,
+        t.renovation_company,t.renovation_company renovationCompany,t.person_main,t.person_main
+        personMain,t.person_main_tel,t.person_main_tel personMainTel
         from room_renovation t
         left join t_dict td on td.table_name='room_renovation' and td.table_columns='state'
         and t.state=td.status_cd
@@ -32,6 +36,9 @@
         </if>
         <if test="isViolation !=null and isViolation != ''">
             and t.is_violation= #{isViolation}
+        </if>
+        <if test="isPostpone !=null and isPostpone != ''">
+            and t.is_postpone= #{isPostpone}
         </if>
         <if test="rId !=null and rId != ''">
             and t.r_id= #{rId}
@@ -53,6 +60,16 @@
         </if>
         <if test="endTime !=null and endTime != ''">
             and t.end_time= #{endTime}
+        </if>
+        <if test="renovationTime !=null and renovationTime != ''">
+            and t.start_time &lt;= #{renovationTime}
+            and t.end_time &gt;= #{renovationTime}
+        </if>
+        <if test="renovationStartTime !=null and renovationStartTime != ''">
+            and t.create_time &gt;= #{renovationStartTime}
+        </if>
+        <if test="renovationEndTime !=null and renovationEndTime != ''">
+            and t.create_time &lt;= #{renovationEndTime}
         </if>
         <if test="state !=null and state != ''">
             and t.state= #{state}
@@ -112,6 +129,21 @@
         <if test="examineRemark != null and examineRemark != ''">
             , t.examineRemark = #{examineRemark}
         </if>
+        <if test="isPostpone != null and isPostpone != ''">
+            , t.is_postpone = #{isPostpone}
+        </if>
+        <if test="postponeTime != null and postponeTime != ''">
+            , t.postpone_time = #{postponeTime}
+        </if>
+        <if test="renovationCompany != null and renovationCompany != ''">
+            , t.renovation_company = #{renovationCompany}
+        </if>
+        <if test="personMain != null and personMain != ''">
+            , t.person_main = #{personMain}
+        </if>
+        <if test="personMainTel != null and personMainTel != ''">
+            , t.person_main_tel = #{personMainTel}
+        </if>
         where 1=1
         <if test="rId !=null and rId != ''">
             and t.r_id= #{rId}
@@ -165,6 +197,16 @@
         <if test="endTime !=null and endTime != ''">
             and t.end_time= #{endTime}
         </if>
+        <if test="renovationTime !=null and renovationTime != ''">
+            and t.start_time &lt;= #{renovationTime}
+            and t.end_time &gt;= #{renovationTime}
+        </if>
+        <if test="renovationStartTime !=null and renovationStartTime != ''">
+            and t.create_time &gt;= #{renovationStartTime}
+        </if>
+        <if test="renovationEndTime !=null and renovationEndTime != ''">
+            and t.create_time &lt;= #{renovationEndTime}
+        </if>
         <if test="state !=null and state != ''">
             and t.state= #{state}
         </if>
@@ -174,6 +216,21 @@
         <if test="personTel !=null and personTel != ''">
             and t.person_tel= #{personTel}
         </if>
+        <if test="isPostpone != null and isPostpone != ''">
+            and t.is_postpone = #{isPostpone}
+        </if>
+        <if test="postponeTime != null and postponeTime != ''">
+            and t.postpone_time = #{postponeTime}
+        </if>
+        <if test="renovationCompany != null and renovationCompany != ''">
+            and t.renovation_company = #{renovationCompany}
+        </if>
+        <if test="personMain != null and personMain != ''">
+            and t.person_main = #{personMain}
+        </if>
+        <if test="personMainTel != null and personMainTel != ''">
+            and t.person_main_tel = #{personMainTel}
+        </if>
     </select>
 
 </mapper>

--
Gitblit v1.8.0