From bd59c19c6fccfc8d0bf3804c0d0c712454bd7d42 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 16 六月 2021 17:24:47 +0800
Subject: [PATCH] 修复扣款
---
java110-db/src/main/resources/mapper/community/RepairReturnVisitServiceDaoImplMapper.xml | 25 ++++++++++++++++++++++---
1 files changed, 22 insertions(+), 3 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/community/RepairReturnVisitServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/community/RepairReturnVisitServiceDaoImplMapper.xml
index 496845c..6b00896 100644
--- a/java110-db/src/main/resources/mapper/community/RepairReturnVisitServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/community/RepairReturnVisitServiceDaoImplMapper.xml
@@ -60,7 +60,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>
@@ -107,12 +116,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 != ''">
@@ -122,7 +132,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}
@@ -139,6 +149,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