From 7d21be9c370e4ece9c07d040b3937adb17809e13 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期四, 18 三月 2021 12:56:23 +0800
Subject: [PATCH] 加入 停车场属性
---
java110-db/src/main/resources/mapper/community/RepairServiceDaoImplMapper.xml | 180 +++++++++++++++++++++++++++++++----------------------------
1 files changed, 95 insertions(+), 85 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/community/RepairServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/community/RepairServiceDaoImplMapper.xml
index 2a4ac21..bd52724 100644
--- a/java110-db/src/main/resources/mapper/community/RepairServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/community/RepairServiceDaoImplMapper.xml
@@ -7,18 +7,20 @@
<!-- 淇濆瓨鎶ヤ慨淇℃伅淇℃伅 add by wuxw 2018-07-03 -->
<insert id="saveBusinessRepairInfo" parameterType="Map">
insert into business_repair_pool(
- operate,repair_name,appointment_time,repair_type,context,repair_id,tel,state,community_id,b_id,room_id
+ operate,repair_name,appointment_time,repair_type,context,repair_id,tel,state,community_id,b_id,repair_obj_type,repair_obj_id,repair_obj_name
) values (
- #{operate},#{repairName},#{appointmentTime},#{repairType},#{context},#{repairId},#{tel},#{state},#{communityId},#{bId},#{roomId}
+ #{operate},#{repairName},#{appointmentTime},#{repairType},#{context},#{repairId},#{tel},#{state},#{communityId},#{bId},
+ #{repairObjType},#{repairObjId},#{repairObjName}
)
</insert>
-
<!-- 鏌ヨ鎶ヤ慨淇℃伅淇℃伅锛圔usiness锛� add by wuxw 2018-07-03 -->
<select id="getBusinessRepairInfo" parameterType="Map" resultType="Map">
select t.operate,t.repair_name,t.repair_name repairName,t.appointment_time,t.appointment_time
appointmentTime,t.repair_type,t.repair_type repairType,t.context,t.repair_id,t.repair_id
- repairId,t.tel,t.state,t.community_id,t.community_id communityId,t.b_id,t.b_id bId,t.room_id,t.room_id roomId
+ repairId,t.tel,t.state,t.community_id,t.community_id communityId,t.b_id,t.b_id bId,
+ t.repair_obj_type,t.repair_obj_id,t.repair_obj_name,t.repair_obj_type repairObjType,t.repair_obj_id
+ repairObjId,t.repair_obj_name repairObjName
from business_repair_pool t
where 1 =1
<if test="operate !=null and operate != ''">
@@ -51,19 +53,16 @@
<if test="bId !=null and bId != ''">
and t.b_id= #{bId}
</if>
- <if test="roomId !=null and roomId != ''">
- and t.room_id= #{roomId}
- </if>
-
</select>
-
<!-- 淇濆瓨鎶ヤ慨淇℃伅淇℃伅鑷� instance琛ㄤ腑 add by wuxw 2018-07-03 -->
<insert id="saveRepairInfoInstance" parameterType="Map">
insert into r_repair_pool(
- repair_name,appointment_time,repair_type,context,repair_id,tel,status_cd,state,community_id,b_id,room_id
+ repair_name,appointment_time,repair_type,context,repair_id,tel,status_cd,state,community_id,b_id,
+ repair_obj_type,repair_obj_id,repair_obj_name
) select
- t.repair_name,t.appointment_time,t.repair_type,t.context,t.repair_id,t.tel,'0',t.state,t.community_id,t.b_id,t.room_id
+ t.repair_name,t.appointment_time,t.repair_type,t.context,t.repair_id,t.tel,'0',t.state,t.community_id,t.b_id,
+ t.repair_obj_type,t.repair_obj_id,t.repair_obj_name
from business_repair_pool t where 1=1
and t.operate= 'ADD'
<if test="repairName !=null and repairName != ''">
@@ -93,21 +92,18 @@
<if test="bId !=null and bId != ''">
and t.b_id= #{bId}
</if>
- <if test="roomId !=null and roomId != ''">
- and t.room_id= #{roomId}
- </if>
-
</insert>
-
<!-- 鏌ヨ鎶ヤ慨淇℃伅淇℃伅 add by wuxw 2018-07-03 -->
<select id="getRepairInfo" parameterType="Map" resultType="Map">
select t.repair_name,t.repair_name repairName,t.appointment_time,t.appointment_time
appointmentTime,t.repair_type,t.repair_type repairType,t.context,t.repair_id,t.repair_id
repairId,t.tel,t.status_cd,t.status_cd statusCd,t.state,t.community_id,t.community_id communityId,t.b_id,t.b_id
- bId,t.room_id,t.room_id roomId,
+ bId,
d.name stateName,
- rs.repair_type_name repairTypeName,rs.repair_way repairWay
+ rs.repair_type_name repairTypeName,rs.repair_way repairWay,rs.return_visit_flag returnVisitFlag,
+ t.repair_obj_type,t.repair_obj_id,t.repair_obj_name,t.repair_obj_type repairObjType,t.repair_obj_id repairObjId,
+ t.repair_obj_name repairObjName
<if test="staffId != null and staffId != ''">
,rru.state repairDispatchState,rru.context repairDispatchContext,td.name repairDispatchStateName
</if>
@@ -127,8 +123,14 @@
AND td.`table_columns` = 'state'
AND td.`status_cd` = rru.state
</if>
+ <if test="repairWay !=null and repairWay != ''">
+ and rs.repair_way= #{repairWay}
+ </if>
+ <if test="returnVisitFlag !=null and returnVisitFlag != ''">
+ and rs.return_visit_flag in ('001','002')
+ </if>
<if test="repairName !=null and repairName != ''">
- and t.repair_name= #{repairName}
+ and t.repair_name like '%${repairName}%'
</if>
<if test="appointmentTime !=null ">
and t.appointment_time= #{appointmentTime}
@@ -151,28 +153,29 @@
<if test="state !=null and state != ''">
and t.state= #{state}
</if>
+ <if test="statess !=null">
+ and t.state in
+ <foreach collection="statess" 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="roomId !=null and roomId != ''">
- and t.room_id= #{roomId}
+ <if test="repairObjType !=null and repairObjType != ''">
+ and t.repair_obj_type= #{repairObjType}
</if>
- <if test="roomIds !=null ">
- and t.room_id in
- <foreach collection="roomIds" item="item" open="(" close=")" separator=",">
- #{item}
- </foreach>
+ <if test="repairObjId !=null and repairObjId != ''">
+ and t.repair_obj_id= #{repairObjId}
</if>
order by t.create_time desc
<if test="page != -1 and page != null ">
limit #{page}, #{row}
</if>
-
</select>
-
<!-- 淇敼鎶ヤ慨淇℃伅淇℃伅 add by wuxw 2018-07-03 -->
<update id="updateRepairInfoInstance" parameterType="Map">
@@ -201,8 +204,14 @@
<if test="communityId !=null and communityId != ''">
, t.community_id= #{communityId}
</if>
- <if test="roomId !=null and roomId != ''">
- , t.room_id= #{roomId}
+ <if test="repairObjType !=null and repairObjType != ''">
+ , t.repair_obj_type= #{repairObjType}
+ </if>
+ <if test="repairObjId !=null and repairObjId != ''">
+ , t.repair_obj_id= #{repairObjId}
+ </if>
+ <if test="repairObjName !=null and repairObjName != ''">
+ , t.repair_obj_name= #{repairObjName}
</if>
where 1=1
<if test="repairId !=null and repairId != ''">
@@ -211,7 +220,6 @@
<if test="bId !=null and bId != ''">
and t.b_id= #{bId}
</if>
-
</update>
<!-- 鏌ヨ鎶ヤ慨淇℃伅鏁伴噺 add by wuxw 2018-07-03 -->
@@ -232,7 +240,7 @@
AND td.`status_cd` = rru.state
</if>
<if test="repairName !=null and repairName != ''">
- and t.repair_name= #{repairName}
+ and t.repair_name like '%${repairName}%'
</if>
<if test="appointmentTime !=null ">
and t.appointment_time= #{appointmentTime}
@@ -255,23 +263,27 @@
<if test="state !=null and state != ''">
and t.state= #{state}
</if>
+ <if test="statess !=null">
+ and t.state in
+ <foreach collection="statess" 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="roomId !=null and roomId != ''">
- and t.room_id= #{roomId}
+ <if test="repairObjType !=null and repairObjType != ''">
+ and t.repair_obj_type= #{repairObjType}
</if>
- <if test="roomIds !=null ">
- and t.room_id in
- <foreach collection="roomIds" item="item" open="(" close=")" separator=",">
- #{item}
- </foreach>
+ <if test="repairWay !=null and repairWay != ''">
+ and rs.repair_way= #{repairWay}
</if>
-
-
+ <if test="repairObjId !=null and repairObjId != ''">
+ and t.repair_obj_id= #{repairObjId}
+ </if>
</select>
<!-- 鏌ヨ鎶ヤ慨淇℃伅淇℃伅 add by wuxw 2018-07-03 -->
@@ -279,13 +291,16 @@
select distinct t.repair_name,t.repair_name repairName,t.appointment_time,t.appointment_time
appointmentTime,t.repair_type,t.repair_type repairType,t.context,t.repair_id,t.repair_id
repairId,t.tel,t.status_cd,t.status_cd statusCd,t.state,t.community_id,t.community_id communityId,t.b_id,t.b_id
- bId,t.room_id,t.room_id roomId,ru.pre_staff_id preStaffId,ru.pre_staff_name preStaffName,
+ bId,ru.pre_staff_id preStaffId,ru.pre_staff_name preStaffName,
d.name stateName,
- rs.repair_type_name repairTypeName,rs.repair_way repairWay
+ rs.repair_type_name repairTypeName,rs.repair_way repairWay,
+ t.repair_obj_type,t.repair_obj_id,t.repair_obj_name,t.repair_obj_type repairObjType,t.repair_obj_id repairObjId,t.repair_obj_name repairObjName,
+ sru.ru_id startRuId,ru.ru_id ruId,ru.pre_ru_id preRuId
from r_repair_pool t
left join t_dict d on t.state = d.status_cd and d.table_name = 'r_repair_pool' and d.table_columns = 'state'
left join r_repair_setting rs on rs.repair_type = t.repair_type and rs.status_cd = '0'
- left join r_repair_user ru on t.repair_id = ru.repair_id and t.status_cd = 0
+ left join r_repair_user ru on t.repair_id = ru.repair_id and ru.status_cd = 0
+ left join r_repair_user sru on sru.repair_id = ru.repair_id and sru.status_cd = 0 and sru.state = '10005'
where 1 =1
and ru.end_time is null
and ru.state = '10001'
@@ -320,20 +335,16 @@
<if test="bId !=null and bId != ''">
and t.b_id= #{bId}
</if>
- <if test="roomId !=null and roomId != ''">
- and t.room_id= #{roomId}
+ <if test="repairObjType !=null and repairObjType != ''">
+ and t.repair_obj_type= #{repairObjType}
</if>
- <if test="roomIds !=null ">
- and t.room_id in
- <foreach collection="roomIds" item="item" open="(" close=")" separator=",">
- #{item}
- </foreach>
+ <if test="repairObjId !=null and repairObjId != ''">
+ and t.repair_obj_id= #{repairObjId}
</if>
order by t.create_time desc
<if test="page != -1 and page != null ">
limit #{page}, #{row}
</if>
-
</select>
<!-- 鏌ヨ鎶ヤ慨淇℃伅鏁伴噺 add by wuxw 2018-07-03 -->
@@ -377,29 +388,24 @@
<if test="bId !=null and bId != ''">
and t.b_id= #{bId}
</if>
- <if test="roomId !=null and roomId != ''">
- and t.room_id= #{roomId}
+ <if test="repairObjType !=null and repairObjType != ''">
+ and t.repair_obj_type= #{repairObjType}
</if>
- <if test="roomIds !=null ">
- and t.room_id in
- <foreach collection="roomIds" item="item" open="(" close=")" separator=",">
- #{item}
- </foreach>
+ <if test="repairObjId !=null and repairObjId != ''">
+ and t.repair_obj_id= #{repairObjId}
</if>
-
-
</select>
-
-
<!-- 鏌ヨ鎶ヤ慨淇℃伅淇℃伅 add by wuxw 2018-07-03 -->
<select id="getStaffFinishRepairInfo" parameterType="Map" resultType="Map">
- select t.repair_name,t.repair_name repairName,t.appointment_time,t.appointment_time
+ select distinct t.repair_name,t.repair_name repairName,t.appointment_time,t.appointment_time
appointmentTime,t.repair_type,t.repair_type repairType,t.context,t.repair_id,t.repair_id
repairId,t.tel,t.status_cd,t.status_cd statusCd,t.state,t.community_id,t.community_id communityId,t.b_id,t.b_id
- bId,t.room_id,t.room_id roomId,
+ bId,
d.name stateName,
- rs.repair_type_name repairTypeName,rs.repair_way repairWay
+ rs.repair_type_name repairTypeName,rs.repair_way repairWay,
+ t.repair_obj_type,t.repair_obj_id,t.repair_obj_name,t.repair_obj_type repairObjType,t.repair_obj_id
+ repairObjId,t.repair_obj_name repairObjName
from r_repair_pool t
left join t_dict d on t.state = d.status_cd and d.table_name = 'r_repair_pool' and d.table_columns = 'state'
left join r_repair_setting rs on rs.repair_type = t.repair_type and rs.status_cd = '0'
@@ -431,26 +437,28 @@
<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="roomId !=null and roomId != ''">
- and t.room_id= #{roomId}
+ <if test="repairObjType !=null and repairObjType != ''">
+ and t.repair_obj_type= #{repairObjType}
</if>
- <if test="roomIds !=null ">
- and t.room_id in
- <foreach collection="roomIds" item="item" open="(" close=")" separator=",">
- #{item}
- </foreach>
+ <if test="repairObjId !=null and repairObjId != ''">
+ and t.repair_obj_id= #{repairObjId}
</if>
order by t.create_time desc
<if test="page != -1 and page != null ">
limit #{page}, #{row}
</if>
-
</select>
<!-- 鏌ヨ鎶ヤ慨淇℃伅鏁伴噺 add by wuxw 2018-07-03 -->
@@ -487,23 +495,25 @@
<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="roomId !=null and roomId != ''">
- and t.room_id= #{roomId}
- </if>
- <if test="roomIds !=null ">
- and t.room_id in
- <foreach collection="roomIds" item="item" open="(" close=")" separator=",">
- #{item}
- </foreach>
- </if>
-
+ <if test="repairObjType !=null and repairObjType != ''">
+ and t.repair_obj_type= #{repairObjType}
+ </if>
+ <if test="repairObjId !=null and repairObjId != ''">
+ and t.repair_obj_id= #{repairObjId}
+ </if>
+ group by ru.staff_id
</select>
-
</mapper>
--
Gitblit v1.8.0