From d7d9b601b2e4fdb663375993e2cfbdbd363df421 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期二, 11 七月 2023 22:17:37 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
java110-db/src/main/resources/mapper/community/RepairSettingServiceDaoImplMapper.xml | 124 +++++++++++++++++++++++++++++++---------
1 files changed, 95 insertions(+), 29 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 3e2c306..e66a719
--- a/java110-db/src/main/resources/mapper/community/RepairSettingServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/community/RepairSettingServiceDaoImplMapper.xml
@@ -1,24 +1,26 @@
<?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="repairSettingServiceDaoImpl">
<!-- 淇濆瓨鎶ヤ慨璁剧疆淇℃伅 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
- ) values (
- #{operate},#{repairTypeName},#{repairType},#{remark},#{bId},#{communityId},#{repairWay},#{settingId}
- )
+ insert into business_repair_setting(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, is_show)
+ values (#{operate}, #{repairTypeName}, #{repairType}, #{repairSettingType}, #{remark}, #{bId}, #{communityId},
+ #{repairWay}, #{settingId}, #{publicArea}, #{payFeeFlag}, #{priceScope}, #{returnVisitFlag}, #{isShow})
</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
+ 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
+ ,t.is_show,t.is_show isShow
from business_repair_setting t
where 1 =1
<if test="operate !=null and operate != ''">
@@ -30,6 +32,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>
@@ -45,16 +50,20 @@
<if test="settingId !=null and settingId != ''">
and t.setting_id= #{settingId}
</if>
-
+ <if test="isShow !=null and isShow != ''">
+ and t.is_show= #{isShow}
+ </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
- ) select t.repair_type_name,t.repair_type,t.remark,'0',t.b_id,t.community_id,t.repair_way,t.setting_id from
- business_repair_setting t where 1=1
+ 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,is_show
+ ) 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,t.is_show
+ from business_repair_setting t where 1=1
and t.operate= 'ADD'
<if test="repairTypeName !=null and repairTypeName != ''">
and t.repair_type_name= #{repairTypeName}
@@ -62,6 +71,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>
@@ -77,23 +89,37 @@
<if test="settingId !=null and settingId != ''">
and t.setting_id= #{settingId}
</if>
-
+ <if test="isShow !=null and isShow != ''">
+ and t.is_show= #{isShow}
+ </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.is_show,t.is_show isShow
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}
@@ -113,13 +139,23 @@
<if test="settingId !=null and settingId != ''">
and t.setting_id= #{settingId}
</if>
+ <if test="publicArea !=null and publicArea != ''">
+ and t.public_area= #{publicArea}
+ </if>
+ <if test="payFeeFlag !=null and payFeeFlag != ''">
+ and t.pay_fee_flag= #{payFeeFlag}
+ </if>
+ <if test="returnVisitFlag !=null and returnVisitFlag != ''">
+ and t.return_visit_flag= #{returnVisitFlag}
+ </if>
+ <if test="isShow !=null and isShow != ''">
+ and t.is_show= #{isShow}
+ </if>
order by t.create_time desc
<if test="page != -1 and page != null ">
limit #{page}, #{row}
</if>
-
</select>
-
<!-- 淇敼鎶ヤ慨璁剧疆淇℃伅 add by wuxw 2018-07-03 -->
<update id="updateRepairSettingInfoInstance" parameterType="Map">
@@ -133,6 +169,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>
@@ -142,6 +181,21 @@
<if test="repairWay !=null and repairWay != ''">
, t.repair_way= #{repairWay}
</if>
+ <if test="publicArea !=null and publicArea != ''">
+ , t.public_area= #{publicArea}
+ </if>
+ <if test="payFeeFlag !=null and payFeeFlag != ''">
+ , t.pay_fee_flag= #{payFeeFlag}
+ </if>
+ <if test="returnVisitFlag !=null and returnVisitFlag != ''">
+ , t.return_visit_flag= #{returnVisitFlag}
+ </if>
+ <if test="priceScope !=null and priceScope != ''">
+ , t.price_scope= #{priceScope}
+ </if>
+ <if test="isShow !=null and isShow != ''">
+ , t.is_show= #{isShow}
+ </if>
where 1=1
<if test="bId !=null and bId != ''">
and t.b_id= #{bId}
@@ -149,20 +203,23 @@
<if test="settingId !=null and settingId != ''">
and t.setting_id= #{settingId}
</if>
-
</update>
<!-- 鏌ヨ鎶ヤ慨璁剧疆鏁伴噺 add by wuxw 2018-07-03 -->
<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= #{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}
@@ -182,8 +239,17 @@
<if test="settingId !=null and settingId != ''">
and t.setting_id= #{settingId}
</if>
-
-
+ <if test="publicArea !=null and publicArea != ''">
+ and t.public_area= #{publicArea}
+ </if>
+ <if test="payFeeFlag !=null and payFeeFlag != ''">
+ and t.pay_fee_flag= #{payFeeFlag}
+ </if>
+ <if test="returnVisitFlag !=null and returnVisitFlag != ''">
+ and t.return_visit_flag= #{returnVisitFlag}
+ </if>
+ <if test="isShow !=null and isShow != ''">
+ and t.is_show= #{isShow}
+ </if>
</select>
-
</mapper>
--
Gitblit v1.8.0