From 05683f2b2bdbdbe21cf17ad523c21ab338bd1c54 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期二, 19 七月 2022 21:49:55 +0800
Subject: [PATCH] 优化添加设备 功能
---
java110-db/src/main/resources/mapper/community/RepairUserServiceDaoImplMapper.xml | 132 ++++++++++++++++++++++++++++++++++---------
1 files changed, 104 insertions(+), 28 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/community/RepairUserServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/community/RepairUserServiceDaoImplMapper.xml
old mode 100644
new mode 100755
index 894959f..1285234
--- a/java110-db/src/main/resources/mapper/community/RepairUserServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/community/RepairUserServiceDaoImplMapper.xml
@@ -7,9 +7,22 @@
<!-- 淇濆瓨鎶ヤ慨娲惧崟淇℃伅 add by wuxw 2018-07-03 -->
<insert id="saveBusinessRepairUserInfo" parameterType="Map">
insert into business_repair_user(
- operate,context,repair_id,ru_id,state,community_id,b_id,user_id
+ 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,start_time,pre_ru_id
) values (
- #{operate},#{context},#{repairId},#{ruId},#{state},#{communityId},#{bId},#{userId}
+ #{operate},#{context},#{repairId},#{ruId},#{state},#{communityId},#{bId},#{staffId},
+ #{staffName},#{preStaffId},#{preStaffName},#{repairEvent},#{endTime},#{startTime},#{preRuId}
+ )
+ </insert>
+
+ <!-- 淇濆瓨鎶ヤ慨娲惧崟淇℃伅 add by fqz 2021-04-02 -->
+ <insert id="saveRepairUser" parameterType="Map">
+ insert into r_repair_user(
+ context,repair_id,ru_id,state,community_id,b_id,staff_id,staff_name,pre_staff_id,
+ pre_staff_name,repair_event,end_time,start_time,pre_ru_id,create_time
+ ) values (
+ #{context},#{repairId},#{ruId},#{state},#{communityId},#{bId},#{staffId},
+ #{staffName},#{preStaffId},#{preStaffName},#{repairEvent},#{endTime},#{startTime},#{preRuId},#{createTime}
)
</insert>
@@ -17,7 +30,11 @@
<!-- 鏌ヨ鎶ヤ慨娲惧崟淇℃伅锛圔usiness锛� add by wuxw 2018-07-03 -->
<select id="getBusinessRepairUserInfo" parameterType="Map" resultType="Map">
select t.operate,t.context,t.repair_id,t.repair_id repairId,t.ru_id,t.ru_id
- ruId,t.state,t.community_id,t.community_id communityId,t.b_id,t.b_id bId,t.user_id,t.user_id userId
+ ruId,t.state,t.community_id,t.community_id communityId,t.b_id,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,t.repair_event,
+ 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 != ''">
@@ -41,18 +58,17 @@
<if test="bId !=null and bId != ''">
and t.b_id= #{bId}
</if>
- <if test="userId !=null and userId != ''">
- and t.user_id= #{userId}
- </if>
-
</select>
<!-- 淇濆瓨鎶ヤ慨娲惧崟淇℃伅鑷� instance琛ㄤ腑 add by wuxw 2018-07-03 -->
<insert id="saveRepairUserInfoInstance" parameterType="Map">
insert into r_repair_user(
- context,repair_id,status_cd,ru_id,state,community_id,b_id,user_id
- ) select t.context,t.repair_id,'0',t.ru_id,t.state,t.community_id,t.b_id,t.user_id from business_repair_user t
+ 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_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_ru_id
+ from business_repair_user t
where 1=1
and t.operate= 'ADD'
<if test="context !=null and context != ''">
@@ -76,21 +92,34 @@
<if test="userId !=null and userId != ''">
and t.user_id= #{userId}
</if>
-
</insert>
<!-- 鏌ヨ鎶ヤ慨娲惧崟淇℃伅 add by wuxw 2018-07-03 -->
<select id="getRepairUserInfo" parameterType="Map" resultType="Map">
- select t.context,t.repair_id,t.repair_id repairId,t.status_cd,t.status_cd statusCd,t.ru_id,t.ru_id
- ruId,t.state,t.community_id,t.community_id communityId,t.b_id,t.b_id bId,t.user_id,t.user_id userId
+ select t.context,t.repair_id,t.repair_id repairId,t.status_cd,t.status_cd statusCd,
+ t.ru_id,t.ru_id ruId,t.state,t.community_id,t.community_id communityId,t.b_id,
+ 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.pre_ru_id,t.pre_ru_id preRuId,t.create_time createTime,
+ rp.pay_type payType,d2.name payTypeName
from r_repair_user t
- where 1 =1
+ left join r_repair_pool rp on t.repair_id = rp.repair_id and t.state in ('10009','12000')
+ left join t_dict d on t.state = d.status_cd and d.table_name = 'r_repair_user' and d.table_columns = 'state'
+ left join t_dict d2 on rp.pay_type = d2.status_cd and d2.table_name = 'r_repair_pool' and d2.table_columns = 'pay_type'
+ where 1 = 1
<if test="context !=null and context != ''">
and t.context= #{context}
</if>
<if test="repairId !=null and repairId != ''">
and t.repair_id= #{repairId}
+ </if>
+ <if test="repairIds !=null">
+ and t.repair_id in
+ <foreach collection="repairIds" item="item" open="(" close=")" separator=",">
+ #{item}
+ </foreach>
</if>
<if test="statusCd !=null and statusCd != ''">
and t.status_cd= #{statusCd}
@@ -101,19 +130,34 @@
<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>
<if test="bId !=null and bId != ''">
and t.b_id= #{bId}
</if>
- <if test="userId !=null and userId != ''">
- and t.user_id= #{userId}
+ <if test="staffId !=null and staffId != ''">
+ and t.staff_id= #{staffId}
</if>
+ <if test="repairEvent !=null and repairEvent != ''">
+ and t.repair_event= #{repairEvent}
+ </if>
+ <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>
+ order by t.start_time
<if test="page != -1 and page != null ">
limit #{page}, #{row}
</if>
-
</select>
@@ -126,17 +170,20 @@
<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="userId !=null and userId != ''">
- , t.user_id= #{userId}
+ <if test="endTime !=null ">
+ , t.end_time= #{endTime}
+ </if>
+ <if test="startTime !=null ">
+ , t.start_time= #{startTime}
+ </if>
+ <if test="staffName !=null and staffName != ''">
+ , t.staff_name= #{staffName}
</if>
where 1=1
<if test="ruId !=null and ruId != ''">
@@ -145,19 +192,36 @@
<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 -->
<select id="queryRepairUsersCount" parameterType="Map" resultType="Map">
select count(1) count
from r_repair_user t
- where 1 =1
+ left join r_repair_pool rp on t.repair_id = rp.repair_id and t.state in ('10009','12000')
+ left join t_dict d on t.state = d.status_cd and d.table_name = 'r_repair_user' and d.table_columns = 'state'
+ left join t_dict d2 on rp.pay_type = d2.status_cd and d2.table_name = 'r_repair_pool' and d2.table_columns = 'pay_type'
+ where 1 = 1
<if test="context !=null and context != ''">
and t.context= #{context}
</if>
<if test="repairId !=null and repairId != ''">
and t.repair_id= #{repairId}
+ </if>
+ <if test="repairIds !=null">
+ and t.repair_id in
+ <foreach collection="repairIds" item="item" open="(" close=")" separator=",">
+ #{item}
+ </foreach>
</if>
<if test="statusCd !=null and statusCd != ''">
and t.status_cd= #{statusCd}
@@ -168,17 +232,29 @@
<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>
<if test="bId !=null and bId != ''">
and t.b_id= #{bId}
</if>
- <if test="userId !=null and userId != ''">
- and t.user_id= #{userId}
+ <if test="staffId !=null and staffId != ''">
+ and t.staff_id= #{staffId}
</if>
-
-
+ <if test="repairEvent !=null and repairEvent != ''">
+ and t.repair_event= #{repairEvent}
+ </if>
+ <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