From f14c50cb0036d3ddd655ce4e34732ba396a836c4 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 30 五月 2023 12:42:03 +0800
Subject: [PATCH] optimize 统计
---
java110-db/src/main/resources/mapper/community/RepairServiceDaoImplMapper.xml | 94 ++++++++++++++++++++++++++++++++++++-----------
1 files changed, 72 insertions(+), 22 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/community/RepairServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/community/RepairServiceDaoImplMapper.xml
index d4dab74..116c52a 100755
--- a/java110-db/src/main/resources/mapper/community/RepairServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/community/RepairServiceDaoImplMapper.xml
@@ -1,18 +1,18 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
- PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="repairServiceDaoImpl">
<!-- 淇濆瓨鎶ヤ慨淇℃伅淇℃伅 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,repair_obj_type,repair_obj_id,
- repair_obj_name, maintenance_type,repair_channel,repair_materials,repair_fee
- ) values (
- #{operate},#{repairName},#{appointmentTime},#{repairType},#{context},#{repairId},#{tel},#{state},#{communityId},#{bId},
- #{repairObjType},#{repairObjId},#{repairObjName},#{maintenanceType},#{repairChannel},#{repairMaterials},#{repairFee}
- )
+ insert into business_repair_pool(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, maintenance_type, repair_channel, repair_materials,
+ repair_fee, pay_type)
+ values (#{operate}, #{repairName}, #{appointmentTime}, #{repairType}, #{context}, #{repairId}, #{tel}, #{state},
+ #{communityId}, #{bId},
+ #{repairObjType}, #{repairObjId}, #{repairObjName}, #{maintenanceType}, #{repairChannel},
+ #{repairMaterials}, #{repairFee}, #{payType})
</insert>
<!-- 鏌ヨ鎶ヤ慨淇℃伅淇℃伅锛圔usiness锛� add by wuxw 2018-07-03 -->
@@ -23,7 +23,7 @@
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,t.maintenance_type,t.maintenance_type maintenanceType,
t.repair_channel,t.repair_channel repairChannel,t.repair_materials,t.repair_materials repairMaterials,
- t.repair_fee,t.repair_fee repairFee
+ t.repair_fee,t.repair_fee repairFee,t.pay_type,t.pay_type payType
from business_repair_pool t
where 1 =1
<if test="operate !=null and operate != ''">
@@ -65,6 +65,9 @@
<if test="repairFee !=null and repairFee != ''">
and t.repair_fee= #{repairFee}
</if>
+ <if test="payType !=null and payType != ''">
+ and t.pay_type= #{payType}
+ </if>
<if test="bId !=null and bId != ''">
and t.b_id= #{bId}
</if>
@@ -74,11 +77,11 @@
<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,
- repair_obj_type,repair_obj_id,repair_obj_name,repair_channel,maintenance_type,repair_materials,repair_fee
+ repair_obj_type,repair_obj_id,repair_obj_name,repair_channel,maintenance_type,repair_materials,repair_fee,pay_type
) 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.repair_obj_type,t.repair_obj_id,t.repair_obj_name,t.repair_channel,t.maintenance_type,t.repair_materials,
- t.repair_fee
+ t.repair_fee,t.pay_type
from business_repair_pool t where 1=1
and t.operate= 'ADD'
<if test="repairName !=null and repairName != ''">
@@ -117,6 +120,9 @@
<if test="repairFee !=null and repairFee != ''">
and t.repair_fee= #{repairFee}
</if>
+ <if test="payType !=null and payType != ''">
+ and t.pay_type= #{payType}
+ </if>
<if test="bId !=null and bId != ''">
and t.b_id= #{bId}
</if>
@@ -131,14 +137,17 @@
t.repair_materials,t.repair_materials repairMaterials,t.repair_fee,t.repair_fee repairFee,
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,rrv.visit_type visitType,rrv.context visitContext,a.appraise_score appraiseScore,
- a.door_speed_score doorSpeedScore,a.repairman_service_score repairmanServiceScore
+ t.repair_obj_name repairObjName,rrv.visit_type visitType,rrv.context visitContext,a.appraise_score
+ appraiseScore, a.door_speed_score doorSpeedScore,a.repairman_service_score repairmanServiceScore,
+ t.pay_type,t.pay_type payType,rs.repair_setting_type repairSettingType,d1.name repairSettingTypeName,t.create_time createTime
<if test="staffId != null and staffId != ''">
,rru.state repairDispatchState,rru.context repairDispatchContext,td.name repairDispatchStateName
</if>
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 t_dict d1 on rs.repair_setting_type = d1.status_cd and d1.table_name = 'r_repair_setting' and
+ d1.table_columns = 'repair_setting_type'
left join r_repair_return_visit rrv on t.repair_id = rrv.repair_id and rrv.community_id = t.community_id and
rrv.status_cd = '0'
left join appraise a on a.obj_id = t.repair_id and a.status_cd = '0'
@@ -158,6 +167,9 @@
<if test="repairWay !=null and repairWay != ''">
and rs.repair_way= #{repairWay}
</if>
+ <if test="repairSettingType !=null and repairSettingType != ''">
+ and rs.repair_setting_type= #{repairSettingType}
+ </if>
<if test="returnVisitFlag != null and returnVisitFlag != '' and returnVisitFlag != '003'">
and rs.return_visit_flag in ('001','002')
</if>
@@ -166,6 +178,9 @@
</if>
<if test="repairName !=null and repairName != ''">
and t.repair_name like '%${repairName}%'
+ </if>
+ <if test="repairNameLike !=null and repairNameLike != ''">
+ and t.repair_name like concat('%',#{repairNameLike},'%')
</if>
<if test="appointmentTime !=null ">
and t.appointment_time= #{appointmentTime}
@@ -217,6 +232,9 @@
</if>
<if test="repairFee !=null and repairFee != ''">
and t.repair_fee= #{repairFee}
+ </if>
+ <if test="payType !=null and payType != ''">
+ and t.pay_type= #{payType}
</if>
<if test="repairChannels !=null">
and t.repair_channel in
@@ -275,6 +293,9 @@
<if test="repairFee !=null and repairFee != ''">
, t.repair_fee= #{repairFee}
</if>
+ <if test="payType !=null and payType != ''">
+ , t.pay_type= #{payType}
+ </if>
where 1=1
<if test="repairId !=null and repairId != ''">
and t.repair_id= #{repairId}
@@ -305,11 +326,20 @@
<if test="repairName !=null and repairName != ''">
and t.repair_name like '%${repairName}%'
</if>
+ <if test="repairNameLike !=null and repairNameLike != ''">
+ and t.repair_name like concat('%',#{repairNameLike},'%')
+ </if>
<if test="appointmentTime !=null ">
and t.appointment_time= #{appointmentTime}
</if>
<if test="repairType !=null and repairType != ''">
and t.repair_type= #{repairType}
+ </if>
+ <if test="repairSettingType !=null and repairSettingType != ''">
+ and rs.repair_setting_type= #{repairSettingType}
+ </if>
+ <if test="payType !=null and payType != ''">
+ and t.pay_type= #{payType}
</if>
<if test="context !=null and context != ''">
and t.context= #{context}
@@ -347,6 +377,9 @@
<if test="repairObjId !=null and repairObjId != ''">
and t.repair_obj_id= #{repairObjId}
</if>
+ <if test="maintenanceType !=null and maintenanceType != ''">
+ and t.maintenance_type= #{maintenanceType}
+ </if>
<if test="repairChannels !=null">
and t.repair_channel in
<foreach collection="repairChannels" item="item" open="(" close=")" separator=",">
@@ -356,8 +389,7 @@
</select>
<!-- 鏌ヨ鎶ヤ慨淇℃伅淇℃伅 add by wuxw 2018-07-03
- 灏嗙姸鎬佸厛璋冩暣 and ru.state in ('10001','10002')
- -->
+ 灏嗙姸鎬佸厛璋冩暣 and ru.state in ('10001','10002')-->
<select id="getStaffRepairInfo" parameterType="Map" resultType="Map">
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
@@ -369,7 +401,7 @@
repairObjId,t.repair_obj_name repairObjName,t.repair_channel repairChannel,
sru.ru_id startRuId,ru.ru_id ruId,ru.pre_ru_id preRuId,t.maintenance_type,t.maintenance_type maintenanceType,
t.repair_channel,t.repair_channel repairChannel,t.repair_materials,t.repair_materials repairMaterials,
- t.repair_fee,t.repair_fee repairFee
+ t.repair_fee,t.repair_fee repairFee,t.pay_type,t.pay_type payType,t.create_time
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'
@@ -379,7 +411,7 @@
td.table_columns='return_visit_flag'
where 1 =1
and ru.state in ('10001','10009','11000')
- and t.state in('1000','1100','1200','1300','1400','1700','1800')
+ and t.state in('1000','1100','1200','1300','1400','1700','1800','2001')
<if test="staffId !=null and staffId != ''">
and ru.staff_id = #{staffId}
</if>
@@ -425,6 +457,9 @@
<if test="repairFee !=null and repairFee != ''">
and t.repair_fee= #{repairFee}
</if>
+ <if test="payType !=null and payType != ''">
+ and t.pay_type= #{payType}
+ </if>
order by t.create_time desc
<if test="page != -1 and page != null ">
limit #{page}, #{row}
@@ -443,7 +478,7 @@
td.table_columns='return_visit_flag'
where 1 =1
and ru.state in ('10001','10009','11000')
- and t.state in('1000','1100','1200','1300','1400','1700','1800')
+ and t.state in('1000','1100','1200','1300','1400','1700','1800','2001')
<if test="staffId !=null and staffId != ''">
and ru.staff_id = #{staffId}
</if>
@@ -483,6 +518,9 @@
<if test="repairObjId !=null and repairObjId != ''">
and t.repair_obj_id= #{repairObjId}
</if>
+ <if test="payType !=null and payType != ''">
+ and t.pay_type= #{payType}
+ </if>
</select>
<!-- 鏌ヨ鎶ヤ慨淇℃伅淇℃伅 add by wuxw 2018-07-03 -->
@@ -495,7 +533,7 @@
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,t.maintenance_type,t.maintenance_type maintenanceType,
t.repair_channel,t.repair_channel repairChannel,t.repair_materials,t.repair_materials repairMaterials,
- t.repair_fee,t.repair_fee repairFee
+ t.repair_fee,t.repair_fee repairFee,t.pay_type,t.pay_type payType,t.create_time
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'
@@ -503,7 +541,7 @@
left join t_dict td on rs.return_visit_flag = td.status_cd and td.table_name='r_repair_setting' and
td.table_columns='return_visit_flag'
where 1 =1
- and ru.state in ('10002','10003','10004','10005','10009','11000','12000')
+ and ru.state in ('10002','10005','10009','11000','12000')
<if test="staffId !=null and staffId != ''">
and ru.staff_id = #{staffId}
</if>
@@ -549,6 +587,12 @@
<if test="repairObjId !=null and repairObjId != ''">
and t.repair_obj_id= #{repairObjId}
</if>
+ <if test="maintenanceType !=null and maintenanceType != ''">
+ and t.maintenance_type= #{maintenanceType}
+ </if>
+ <if test="payType !=null and payType != ''">
+ and t.pay_type= #{payType}
+ </if>
order by t.create_time desc
<if test="page != -1 and page != null ">
limit #{page}, #{row}
@@ -565,7 +609,7 @@
left join t_dict td on rs.return_visit_flag = td.status_cd and td.table_name='r_repair_setting' and
td.table_columns='return_visit_flag'
where 1 =1
- and ru.state in ('10002','10003','10004','10005','10009','11000','12000')
+ and ru.state in ('10002','10005','10009','11000','12000')
<if test="staffId != null and staffId != ''">
and ru.staff_id = #{staffId}
</if>
@@ -611,6 +655,12 @@
<if test="repairObjId !=null and repairObjId != ''">
and t.repair_obj_id= #{repairObjId}
</if>
+ <if test="maintenanceType !=null and maintenanceType != ''">
+ and t.maintenance_type= #{maintenanceType}
+ </if>
+ <if test="payType !=null and payType != ''">
+ and t.pay_type= #{payType}
+ </if>
<if test="staffId != null and staffId != ''">
group by ru.staff_id
</if>
--
Gitblit v1.8.0