From d7d9b601b2e4fdb663375993e2cfbdbd363df421 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期二, 11 七月 2023 22:17:37 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
java110-db/src/main/resources/mapper/community/RepairUserServiceDaoImplMapper.xml | 47 ++++++++++++++++++++++++++++++-----------------
1 files changed, 30 insertions(+), 17 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..1285234 100755
--- a/java110-db/src/main/resources/mapper/community/RepairUserServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/community/RepairUserServiceDaoImplMapper.xml
@@ -15,6 +15,17 @@
)
</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>
+
<!-- 鏌ヨ鎶ヤ慨娲惧崟淇℃伅锛圔usiness锛� add by wuxw 2018-07-03 -->
<select id="getBusinessRepairUserInfo" parameterType="Map" resultType="Map">
@@ -47,7 +58,6 @@
<if test="bId !=null and bId != ''">
and t.b_id= #{bId}
</if>
-
</select>
@@ -82,7 +92,6 @@
<if test="userId !=null and userId != ''">
and t.user_id= #{userId}
</if>
-
</insert>
@@ -93,10 +102,13 @@
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
+ 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
+ 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'
- where 1 =1
+ 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>
@@ -158,18 +170,21 @@
<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>
+ <if test="staffName !=null and staffName != ''">
+ , t.staff_name= #{staffName}
+ </if>
where 1=1
<if test="ruId !=null and ruId != ''">
and t.ru_id= #{ruId}
@@ -177,24 +192,25 @@
<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 -->
<select id="queryRepairUsersCount" parameterType="Map" resultType="Map">
select count(1) count
from r_repair_user t
+ 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'
- where 1 =1
+ 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>
@@ -240,8 +256,5 @@
<if test="preRuId !=null and preRuId != ''">
and t.pre_ru_id= #{preRuId}
</if>
-
-
</select>
-
</mapper>
--
Gitblit v1.8.0