From 755262ba9a1a3c0573a0e910bbd0a353e9e2a2c5 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 16 六月 2021 16:39:57 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
java110-db/src/main/resources/mapper/community/RepairTypeUserServiceDaoImplMapper.xml | 60 ++++++++++++++++++++++++++++++++----------------------------
1 files changed, 32 insertions(+), 28 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/community/RepairTypeUserServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/community/RepairTypeUserServiceDaoImplMapper.xml
old mode 100644
new mode 100755
index abe5c7e..21fd886
--- a/java110-db/src/main/resources/mapper/community/RepairTypeUserServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/community/RepairTypeUserServiceDaoImplMapper.xml
@@ -7,9 +7,10 @@
<!-- 淇濆瓨鎶ヤ慨璁剧疆淇℃伅 add by wuxw 2018-07-03 -->
<insert id="saveBusinessRepairTypeUserInfo" parameterType="Map">
insert into business_repair_type_user(
- operate,type_user_id,repair_type,remark,state,user_name,b_id,community_id,user_id
+ operate,type_user_id,repair_type,remark,state,staff_name,b_id,community_id,staff_id
) values (
- #{operate},#{typeUserId},#{repairType},#{remark},#{state},#{userName},#{bId},#{communityId},#{userId}
+ #{operate},#{typeUserId},#{repairType},#{remark},#{state},#{staffName},#{bId},#{communityId},
+ #{staffId}
)
</insert>
@@ -17,8 +18,8 @@
<!-- 鏌ヨ鎶ヤ慨璁剧疆淇℃伅锛圔usiness锛� add by wuxw 2018-07-03 -->
<select id="getBusinessRepairTypeUserInfo" parameterType="Map" resultType="Map">
select t.operate,t.type_user_id,t.type_user_id typeUserId,t.repair_type,t.repair_type
- repairType,t.remark,t.state,t.user_name,t.user_name userName,t.b_id,t.b_id bId,t.community_id,t.community_id
- communityId,t.user_id,t.user_id userId
+ repairType,t.remark,t.state,t.staff_name,t.staff_name staffName,t.b_id,t.b_id bId,t.community_id,t.community_id
+ communityId,t.staff_id,t.staff_id staffId
from business_repair_type_user t
where 1 =1
<if test="operate !=null and operate != ''">
@@ -36,8 +37,8 @@
<if test="state !=null and state != ''">
and t.state= #{state}
</if>
- <if test="userName !=null and userName != ''">
- and t.user_name= #{userName}
+ <if test="staffName !=null and staffName != ''">
+ and t.staff_name= #{staffName}
</if>
<if test="bId !=null and bId != ''">
and t.b_id= #{bId}
@@ -45,8 +46,8 @@
<if test="communityId !=null and communityId != ''">
and t.community_id= #{communityId}
</if>
- <if test="userId !=null and userId != ''">
- and t.user_id= #{userId}
+ <if test="staffId !=null and staffId != ''">
+ and t.staff_id= #{staffId}
</if>
</select>
@@ -55,8 +56,8 @@
<!-- 淇濆瓨鎶ヤ慨璁剧疆淇℃伅鑷� instance琛ㄤ腑 add by wuxw 2018-07-03 -->
<insert id="saveRepairTypeUserInfoInstance" parameterType="Map">
insert into r_repair_type_user(
- type_user_id,repair_type,remark,status_cd,state,user_name,b_id,community_id,user_id
- ) select t.type_user_id,t.repair_type,t.remark,'0',t.state,t.user_name,t.b_id,t.community_id,t.user_id from
+ type_user_id,repair_type,remark,status_cd,state,staff_name,b_id,community_id,staff_id
+ ) select t.type_user_id,t.repair_type,t.remark,'0',t.state,t.staff_name,t.b_id,t.community_id,t.staff_id from
business_repair_type_user t where 1=1
and t.operate= 'ADD'
<if test="typeUserId !=null and typeUserId != ''">
@@ -71,8 +72,8 @@
<if test="state !=null and state != ''">
and t.state= #{state}
</if>
- <if test="userName !=null and userName != ''">
- and t.user_name= #{userName}
+ <if test="staffName !=null and staffName != ''">
+ and t.staff_name= #{staffName}
</if>
<if test="bId !=null and bId != ''">
and t.b_id= #{bId}
@@ -80,8 +81,8 @@
<if test="communityId !=null and communityId != ''">
and t.community_id= #{communityId}
</if>
- <if test="userId !=null and userId != ''">
- and t.user_id= #{userId}
+ <if test="staffId !=null and staffId != ''">
+ and t.staff_id= #{staffId}
</if>
</insert>
@@ -90,10 +91,12 @@
<!-- 鏌ヨ鎶ヤ慨璁剧疆淇℃伅 add by wuxw 2018-07-03 -->
<select id="getRepairTypeUserInfo" parameterType="Map" resultType="Map">
select t.type_user_id,t.type_user_id typeUserId,t.repair_type,t.repair_type
- repairType,t.remark,t.status_cd,t.status_cd statusCd,t.state,t.user_name,t.user_name userName,t.b_id,t.b_id
- bId,t.community_id,t.community_id communityId,t.user_id,t.user_id userId,d.name stateName
+ repairType,t.remark,t.status_cd,t.status_cd statusCd,t.state,t.staff_name,t.staff_name staffName,t.b_id,t.b_id
+ bId,t.community_id,t.community_id communityId,t.staff_id,t.staff_id staffId,d.name stateName,rrs.repair_type_name repairTypeName,
+ t.create_time createTime
from r_repair_type_user t
left join t_dict d on t.state = d.status_cd and d.table_name = 'r_repair_type_user' and d.table_columns = 'state'
+ left join r_repair_setting rrs on t.repair_type = rrs.repair_type and rrs.status_cd = '0'
where 1 =1
<if test="typeUserId !=null and typeUserId != ''">
and t.type_user_id= #{typeUserId}
@@ -110,8 +113,8 @@
<if test="state !=null and state != ''">
and t.state= #{state}
</if>
- <if test="userName !=null and userName != ''">
- and t.user_name= #{userName}
+ <if test="staffName !=null and staffName != ''">
+ and t.staff_name= #{staffName}
</if>
<if test="bId !=null and bId != ''">
and t.b_id= #{bId}
@@ -119,8 +122,8 @@
<if test="communityId !=null and communityId != ''">
and t.community_id= #{communityId}
</if>
- <if test="userId !=null and userId != ''">
- and t.user_id= #{userId}
+ <if test="staffId !=null and staffId != ''">
+ and t.staff_id= #{staffId}
</if>
order by t.create_time desc
<if test="page != -1 and page != null ">
@@ -145,14 +148,14 @@
<if test="state !=null and state != ''">
, t.state= #{state}
</if>
- <if test="userName !=null and userName != ''">
- , t.user_name= #{userName}
+ <if test="staffName !=null and staffName != ''">
+ , t.staff_name= #{staffName}
</if>
<if test="communityId !=null and communityId != ''">
, t.community_id= #{communityId}
</if>
- <if test="userId !=null and userId != ''">
- , t.user_id= #{userId}
+ <if test="staffId !=null and staffId != ''">
+ , t.staff_id= #{staffId}
</if>
where 1=1
<if test="typeUserId !=null and typeUserId != ''">
@@ -169,6 +172,7 @@
select count(1) count
from r_repair_type_user t
left join t_dict d on t.state = d.status_cd and d.table_name = 'r_repair_type_user' and d.table_columns = 'state'
+ left join r_repair_setting rrs on t.repair_type = rrs.repair_type and rrs.status_cd = '0'
where 1 =1
<if test="typeUserId !=null and typeUserId != ''">
and t.type_user_id= #{typeUserId}
@@ -185,8 +189,8 @@
<if test="state !=null and state != ''">
and t.state= #{state}
</if>
- <if test="userName !=null and userName != ''">
- and t.user_name= #{userName}
+ <if test="staffName !=null and staffName != ''">
+ and t.staff_name= #{staffName}
</if>
<if test="bId !=null and bId != ''">
and t.b_id= #{bId}
@@ -194,8 +198,8 @@
<if test="communityId !=null and communityId != ''">
and t.community_id= #{communityId}
</if>
- <if test="userId !=null and userId != ''">
- and t.user_id= #{userId}
+ <if test="staffId !=null and staffId != ''">
+ and t.staff_id= #{staffId}
</if>
--
Gitblit v1.8.0