From 3b0ddfa0b1c3490fbbf421a84e0431a60fb58387 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期四, 01 四月 2021 12:25:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/xinghong-dev'

---
 java110-db/src/main/resources/mapper/community/RepairUserServiceDaoImplMapper.xml |   19 ++++++++-----------
 1 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/java110-db/src/main/resources/mapper/community/RepairUserServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/community/RepairUserServiceDaoImplMapper.xml
index 00f4c6f..87eebb3 100644
--- a/java110-db/src/main/resources/mapper/community/RepairUserServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/community/RepairUserServiceDaoImplMapper.xml
@@ -158,18 +158,18 @@
         <if test="context !=null and context != ''">
             , t.context= #{context}
         </if>
-
         <if test="state !=null and state != ''">
             , t.state= #{state}
         </if>
         <if test="communityId !=null and communityId != ''">
             , t.community_id= #{communityId}
         </if>
-
-        <if test="end_time !=null ">
-            , t.end_time= #{end_time}
+        <if test="endTime !=null ">
+            , t.end_time= #{endTime}
         </if>
-
+        <if test="startTime !=null ">
+            , t.start_time= #{startTime}
+        </if>
         where 1=1
         <if test="ruId !=null and ruId != ''">
             and t.ru_id= #{ruId}
@@ -177,16 +177,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="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>
 
     <!-- 鏌ヨ鎶ヤ慨娲惧崟鏁伴噺 add by wuxw 2018-07-03 -->
@@ -240,8 +239,6 @@
         <if test="preRuId !=null and preRuId != ''">
             and t.pre_ru_id= #{preRuId}
         </if>
-
-
     </select>
 
 </mapper>

--
Gitblit v1.8.0