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 | 57 ++++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 38 insertions(+), 19 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/community/RepairUserServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/community/RepairUserServiceDaoImplMapper.xml
index d457b72..87eebb3 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,end_time
+ pre_staff_name,repair_event,end_time,start_time,pre_ru_id
) values (
#{operate},#{context},#{repairId},#{ruId},#{state},#{communityId},#{bId},#{staffId},
- #{staffName},#{preStaffId},#{preStaffName},#{repairEvent},#{endTime}
+ #{staffName},#{preStaffId},#{preStaffName},#{repairEvent},#{endTime},#{startTime},#{preRuId}
)
</insert>
@@ -23,7 +23,7 @@
t.staff_id,t.staff_id staffId,t.staff_name,t.staff_name staffName,
t.pre_staff_id,t.pre_staff_id preStaffId,t.pre_staff_name,t.pre_staff_name preStaffName,
t.start_time,t.start_time startTime,t.end_time,t.end_time endTime,t.repair_event,
- t.repair_event repairEvent
+ t.repair_event repairEvent, t.pre_ru_id,t.pre_ru_id preRuId
from business_repair_user t
where 1 =1
<if test="operate !=null and operate != ''">
@@ -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
+ pre_staff_name,repair_event,start_time,end_time,pre_ru_id
) 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.pre_staff_id,t.pre_staff_name,t.repair_event,t.start_time,t.end_time,t.pre_ru_id
from business_repair_user t
where 1=1
and t.operate= 'ADD'
@@ -93,7 +93,7 @@
t.b_id bId,t.staff_id,t.staff_id staffId,t.staff_name,t.staff_name staffName,
t.pre_staff_id,t.pre_staff_id preStaffId,t.pre_staff_name,t.pre_staff_name preStaffName,
t.start_time,t.start_time startTime,t.end_time,t.end_time endTime,d.name stateName,
- t.repair_event,t.repair_event repairEvent
+ t.repair_event,t.repair_event repairEvent, t.pre_ru_id,t.pre_ru_id preRuId,t.create_time createTime
from r_repair_user t
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
@@ -118,6 +118,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>
@@ -133,11 +139,13 @@
<if test="preStaffId !=null and preStaffId != ''">
and t.pre_staff_id= #{preStaffId}
</if>
- order by t.create_time
+ <if test="preRuId !=null and preRuId != ''">
+ and t.pre_ru_id= #{preRuId}
+ </if>
+ order by t.start_time
<if test="page != -1 and page != null ">
limit #{page}, #{row}
</if>
-
</select>
@@ -150,22 +158,18 @@
<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 test="endTime !=null ">
+ , t.end_time= #{endTime}
</if>
- <if test="end_time !=null ">
- , t.end_time= #{end_time}
+ <if test="startTime !=null ">
+ , t.start_time= #{startTime}
</if>
-
where 1=1
<if test="ruId !=null and ruId != ''">
and t.ru_id= #{ruId}
@@ -173,7 +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="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 -->
@@ -203,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>
@@ -218,8 +236,9 @@
<if test="preStaffId !=null and preStaffId != ''">
and t.pre_staff_id= #{preStaffId}
</if>
-
-
+ <if test="preRuId !=null and preRuId != ''">
+ and t.pre_ru_id= #{preRuId}
+ </if>
</select>
</mapper>
--
Gitblit v1.8.0