From 0b04f664887c73e90bf684a4e69c0fdbfe26349d Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 29 三月 2023 13:35:20 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
java110-db/src/main/resources/mapper/community/RepairReturnVisitServiceDaoImplMapper.xml | 31 +++++++++++++++++++++++++------
1 files changed, 25 insertions(+), 6 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/community/RepairReturnVisitServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/community/RepairReturnVisitServiceDaoImplMapper.xml
index d0a6e8f..78ea5d8 100644
--- a/java110-db/src/main/resources/mapper/community/RepairReturnVisitServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/community/RepairReturnVisitServiceDaoImplMapper.xml
@@ -17,8 +17,7 @@
<!-- 鏌ヨ鎶ヤ慨鍥炶淇℃伅 add by wuxw 2018-07-03 -->
<select id="getRepairReturnVisitInfo" parameterType="Map" resultType="Map">
- select t.visit_id,t.visit_id visitId,t.context,t.repair_id
- statusCd,t.community_id,t.community_id communityId,t.visit_person_name,t.visit_person_name
+ select t.visit_id,t.visit_id visitId,t.context,t.community_id,t.community_id communityId,t.visit_person_name,t.visit_person_name
visitPersonName,t.visit_person_id,t.visit_person_id visitPersonId,t.visit_type,t.visit_type visitType,
rrp.repair_id repairId,rrp.repair_obj_name repairObjName,rs.repair_type_name repairTypeName,rrp.tel,rrp.repair_name repairName,
rrp.appointment_time appointmentTime
@@ -27,12 +26,13 @@
left join t_dict d on rrp.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 = rrp.repair_type and rs.status_cd = '0'
where 1 = 1
- and rrp.state = '1800'
and rs.return_visit_flag in ('002','003')
<if test="state == 'waiting'">
+ and rrp.state = '1800'
and t.repair_id is null
</if>
<if test="state == 'finish'">
+ and rrp.state = '1900'
and t.repair_id is not null
</if>
<if test="visitId !=null and visitId != ''">
@@ -59,7 +59,16 @@
<if test="visitType !=null and visitType != ''">
and t.visit_type= #{visitType}
</if>
- order by t.create_time desc
+ <if test="repairType !=null and repairType != ''">
+ and rrp.repair_type= #{repairType}
+ </if>
+ <if test="repairName !=null and repairName != ''">
+ and rrp.repair_name like '%${repairName}%'
+ </if>
+ <if test="tel !=null and tel != ''">
+ and rrp.tel= #{tel}
+ </if>
+ order by rrp.create_time desc
<if test="page != -1 and page != null ">
limit #{page}, #{row}
</if>
@@ -106,12 +115,13 @@
left join t_dict d on rrp.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 = rrp.repair_type and rs.status_cd = '0'
where 1 = 1
- and rrp.state = '1800'
and rs.return_visit_flag in ('002','003')
<if test="state == 'waiting'">
+ and rrp.state = '1800'
and t.repair_id is null
</if>
<if test="state == 'finish'">
+ and rrp.state = '1900'
and t.repair_id is not null
</if>
<if test="visitId !=null and visitId != ''">
@@ -121,7 +131,7 @@
and t.context= #{context}
</if>
<if test="repairId !=null and repairId != ''">
- and t.repair_id= #{repairId}
+ and rrp.repair_id= #{repairId}
</if>
<if test="statusCd !=null and statusCd != ''">
and rrp.status_cd= #{statusCd}
@@ -138,6 +148,15 @@
<if test="visitType !=null and visitType != ''">
and t.visit_type= #{visitType}
</if>
+ <if test="repairType !=null and repairType != ''">
+ and rrp.repair_type= #{repairType}
+ </if>
+ <if test="repairName !=null and repairName != ''">
+ and rrp.repair_name like '%${repairName}%'
+ </if>
+ <if test="tel !=null and tel != ''">
+ and rrp.tel= #{tel}
+ </if>
</select>
--
Gitblit v1.8.0