From 093b73aadb022895a02dbbcd64b87613e19b547b Mon Sep 17 00:00:00 2001
From: 1098226878@qq.com <1098226878@qq.com>
Date: 星期一, 10 一月 2022 18:05:21 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
java110-db/src/main/resources/mapper/community/RepairSettingServiceDaoImplMapper.xml | 39 ++++++++++++++++++++++++++-------------
1 files changed, 26 insertions(+), 13 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/community/RepairSettingServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/community/RepairSettingServiceDaoImplMapper.xml
index 1dbdc16..ff41b69 100755
--- a/java110-db/src/main/resources/mapper/community/RepairSettingServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/community/RepairSettingServiceDaoImplMapper.xml
@@ -7,16 +7,16 @@
<!-- 淇濆瓨鎶ヤ慨璁剧疆淇℃伅 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
+ 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
@@ -30,6 +30,9 @@
</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}
@@ -51,8 +54,8 @@
<!-- 淇濆瓨鎶ヤ慨璁剧疆淇℃伅鑷� 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
+ 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
@@ -62,6 +65,9 @@
</if>
<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}
@@ -83,23 +89,25 @@
<!-- 鏌ヨ鎶ヤ慨璁剧疆淇℃伅 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
+ 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,
+ 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
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 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 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 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}
@@ -146,6 +154,9 @@
<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}
</if>
@@ -180,8 +191,7 @@
<select id="queryRepairSettingsCount" parameterType="Map" resultType="Map">
select count(1) count
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'
where 1 =1
<if test="repairTypeName !=null and repairTypeName != ''">
and t.repair_type_name like '%${repairTypeName}%'
@@ -189,6 +199,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>
--
Gitblit v1.8.0