From 05683f2b2bdbdbe21cf17ad523c21ab338bd1c54 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期二, 19 七月 2022 21:49:55 +0800
Subject: [PATCH] 优化添加设备 功能
---
java110-db/src/main/resources/mapper/community/RepairSettingServiceDaoImplMapper.xml | 55 ++++++++++++++++++++++++++++++++-----------------------
1 files changed, 32 insertions(+), 23 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/community/RepairSettingServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/community/RepairSettingServiceDaoImplMapper.xml
old mode 100644
new mode 100755
index 9316ece..ff41b69
--- a/java110-db/src/main/resources/mapper/community/RepairSettingServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/community/RepairSettingServiceDaoImplMapper.xml
@@ -7,18 +7,18 @@
<!-- 淇濆瓨鎶ヤ慨璁剧疆淇℃伅 add by wuxw 2018-07-03 -->
<insert id="saveBusinessRepairSettingInfo" parameterType="Map">
insert into business_repair_setting(
- operate,repair_type_name,repair_type,remark,b_id,community_id,repair_way,setting_id,public_area,pay_fee_flag,price_scope,return_visit_flag
+ operate,repair_type_name,repair_type,repair_setting_type,remark,b_id,community_id,repair_way,setting_id,public_area,pay_fee_flag,price_scope,return_visit_flag
) values (
- #{operate},#{repairTypeName},#{repairType},#{remark},#{bId},#{communityId},#{repairWay},#{settingId},#{publicArea},#{payFeeFlag},#{priceScope},#{returnVisitFlag}
+ #{operate},#{repairTypeName},#{repairType},#{repairSettingType},#{remark},#{bId},#{communityId},#{repairWay},#{settingId},#{publicArea},#{payFeeFlag},#{priceScope},#{returnVisitFlag}
)
</insert>
-
<!-- 鏌ヨ鎶ヤ慨璁剧疆淇℃伅锛圔usiness锛� add by wuxw 2018-07-03 -->
<select id="getBusinessRepairSettingInfo" parameterType="Map" resultType="Map">
select t.operate,t.repair_type_name,t.repair_type_name repairTypeName,t.repair_type,t.repair_type
- repairType,t.remark,t.b_id,t.b_id bId,t.community_id,t.community_id communityId,t.repair_way,t.repair_way
- repairWay,t.setting_id,t.setting_id settingId,t.public_area,t.public_area publicArea,t.pay_fee_flag,t.pay_fee_flag payFeeFlag
+ repairType,t.repair_setting_type,t.repair_setting_type repairSettingType,t.remark,t.b_id,t.b_id bId,t.community_id,t.community_id communityId,t.repair_way,t.repair_way
+ repairWay,t.setting_id,t.setting_id settingId,t.public_area,t.public_area
+ publicArea,t.pay_fee_flag,t.pay_fee_flag payFeeFlag
,t.price_scope,t.price_scope priceScope,t.return_visit_flag,t.return_visit_flag returnVisitFlag
from business_repair_setting t
where 1 =1
@@ -31,6 +31,9 @@
<if test="repairType !=null and repairType != ''">
and t.repair_type= #{repairType}
</if>
+ <if test="repairSettingType !=null and repairSettingType != ''">
+ and t.repair_setting_type= #{repairSettingType}
+ </if>
<if test="remark !=null and remark != ''">
and t.remark= #{remark}
</if>
@@ -46,15 +49,14 @@
<if test="settingId !=null and settingId != ''">
and t.setting_id= #{settingId}
</if>
-
</select>
-
<!-- 淇濆瓨鎶ヤ慨璁剧疆淇℃伅鑷� instance琛ㄤ腑 add by wuxw 2018-07-03 -->
<insert id="saveRepairSettingInfoInstance" parameterType="Map">
insert into r_repair_setting(
- repair_type_name,repair_type,remark,status_cd,b_id,community_id,repair_way,setting_id,public_area,pay_fee_flag,price_scope,return_visit_flag
- ) select t.repair_type_name,t.repair_type,t.remark,'0',t.b_id,t.community_id,t.repair_way,t.setting_id ,t.public_area,t.pay_fee_flag,t.price_scope,t.return_visit_flag
+ repair_type_name,repair_type,repair_setting_type,remark,status_cd,b_id,community_id,repair_way,setting_id,public_area,pay_fee_flag,price_scope,return_visit_flag
+ ) select t.repair_type_name,t.repair_type,t.repair_setting_type,t.remark,'0',t.b_id,t.community_id,t.repair_way,t.setting_id
+ ,t.public_area,t.pay_fee_flag,t.price_scope,t.return_visit_flag
from
business_repair_setting t where 1=1
and t.operate= 'ADD'
@@ -64,6 +66,9 @@
<if test="repairType !=null and repairType != ''">
and t.repair_type= #{repairType}
</if>
+ <if test="repairSettingType and repairSettingType != ''">
+ and t.repair_setting_type= #{repairSettingType}
+ </if>
<if test="remark !=null and remark != ''">
and t.remark= #{remark}
</if>
@@ -79,26 +84,30 @@
<if test="settingId !=null and settingId != ''">
and t.setting_id= #{settingId}
</if>
-
</insert>
-
<!-- 鏌ヨ鎶ヤ慨璁剧疆淇℃伅 add by wuxw 2018-07-03 -->
<select id="getRepairSettingInfo" parameterType="Map" resultType="Map">
select t.repair_type_name,t.repair_type_name repairTypeName,t.repair_type,t.repair_type
- repairType,t.remark,t.status_cd,t.status_cd statusCd,t.b_id,t.b_id bId,t.community_id,t.community_id
- communityId,t.repair_way,t.repair_way repairWay,t.setting_id,t.setting_id settingId,t.create_time createTime,d.name repairWayName,
+ repairType,t.repair_setting_type,t.repair_setting_type repairSettingType,t.remark,t.status_cd,t.status_cd statusCd,t.b_id,t.b_id bId,t.community_id,t.community_id
+ communityId,t.repair_way,t.repair_way repairWay,t.setting_id,t.setting_id settingId,t.create_time
+ createTime,d.name repairWayName,d2.name repairSettingTypeName,
t.public_area,t.public_area publicArea,t.pay_fee_flag,t.pay_fee_flag payFeeFlag
- ,t.price_scope,t.price_scope priceScope,t.return_visit_flag,t.return_visit_flag returnVisitFlag,d1.name returnVisitFlagName
+ ,t.price_scope,t.price_scope priceScope,t.return_visit_flag,t.return_visit_flag returnVisitFlag,d1.name
+ returnVisitFlagName
from r_repair_setting t
- left join t_dict d on t.repair_way = d.status_cd and d.table_name = 'r_repair_setting' and d.table_columns = 'repair_way'
+ left join t_dict d on t.repair_way = d.status_cd and d.table_name = 'r_repair_setting' and d.table_columns ='repair_way'
left join t_dict d1 on t.return_visit_flag = d1.status_cd and d1.table_name = 'r_repair_setting' and d1.table_columns = 'return_visit_flag'
+ left join t_dict d2 on t.repair_setting_type = d2.status_cd and d2.table_name = 'r_repair_setting' and d2.table_columns = 'repair_setting_type'
where 1 =1
<if test="repairTypeName !=null and repairTypeName != ''">
- and t.repair_type_name= #{repairTypeName}
+ and t.repair_type_name like '%${repairTypeName}%'
</if>
<if test="repairType !=null and repairType != ''">
and t.repair_type= #{repairType}
+ </if>
+ <if test="repairSettingType !=null and repairSettingType != ''">
+ and t.repair_setting_type= #{repairSettingType}
</if>
<if test="remark !=null and remark != ''">
and t.remark= #{remark}
@@ -131,9 +140,7 @@
<if test="page != -1 and page != null ">
limit #{page}, #{row}
</if>
-
</select>
-
<!-- 淇敼鎶ヤ慨璁剧疆淇℃伅 add by wuxw 2018-07-03 -->
<update id="updateRepairSettingInfoInstance" parameterType="Map">
@@ -146,6 +153,9 @@
</if>
<if test="repairType !=null and repairType != ''">
, t.repair_type= #{repairType}
+ </if>
+ <if test="repairSettingType !=null and repairSettingType != ''">
+ , t.repair_setting_type= #{repairSettingType}
</if>
<if test="remark !=null and remark != ''">
, t.remark= #{remark}
@@ -175,7 +185,6 @@
<if test="settingId !=null and settingId != ''">
and t.setting_id= #{settingId}
</if>
-
</update>
<!-- 鏌ヨ鎶ヤ慨璁剧疆鏁伴噺 add by wuxw 2018-07-03 -->
@@ -185,10 +194,13 @@
left join t_dict d on t.repair_way = d.status_cd and d.table_name = 'r_repair_setting' and d.table_columns = 'repair_way'
where 1 =1
<if test="repairTypeName !=null and repairTypeName != ''">
- and t.repair_type_name= #{repairTypeName}
+ and t.repair_type_name like '%${repairTypeName}%'
</if>
<if test="repairType !=null and repairType != ''">
and t.repair_type= #{repairType}
+ </if>
+ <if test="repairSettingType !=null and repairSettingType != ''">
+ and t.repair_setting_type= #{repairSettingType}
</if>
<if test="remark !=null and remark != ''">
and t.remark= #{remark}
@@ -218,8 +230,5 @@
<if test="returnVisitFlag !=null and returnVisitFlag != ''">
and t.return_visit_flag= #{returnVisitFlag}
</if>
-
-
</select>
-
</mapper>
--
Gitblit v1.8.0