From 0b04f664887c73e90bf684a4e69c0fdbfe26349d Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 29 三月 2023 13:35:20 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

---
 java110-db/src/main/resources/mapper/community/RepairSettingV1ServiceDaoImplMapper.xml |  285 ++++++++++++++++++++++++++++----------------------------
 1 files changed, 142 insertions(+), 143 deletions(-)

diff --git a/java110-db/src/main/resources/mapper/community/RepairSettingV1ServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/community/RepairSettingV1ServiceDaoImplMapper.xml
index da75e67..83a1224 100644
--- a/java110-db/src/main/resources/mapper/community/RepairSettingV1ServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/community/RepairSettingV1ServiceDaoImplMapper.xml
@@ -1,160 +1,159 @@
 <?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="repairSettingV1ServiceDaoImpl">
 
-
-
-
-
     <!-- 淇濆瓨鎶ヤ慨璁剧疆淇℃伅 add by wuxw 2018-07-03 -->
     <insert id="saveRepairSettingInfo" parameterType="Map">
-        insert into r_repair_setting(
-price_scope,pay_fee_flag,return_visit_flag,repair_type_name,repair_type,remark,community_id,public_area,repair_way,repair_setting_type,setting_id
-) values (
-#{priceScope},#{payFeeFlag},#{returnVisitFlag},#{repairTypeName},#{repairType},#{remark},#{communityId},#{publicArea},#{repairWay},#{repairSettingType},#{settingId}
-)
+        insert into r_repair_setting(price_scope, pay_fee_flag, return_visit_flag, repair_type_name, repair_type,
+                                     remark, community_id, public_area, repair_way, repair_setting_type, setting_id,
+                                     is_show)
+        values (#{priceScope}, #{payFeeFlag}, #{returnVisitFlag}, #{repairTypeName}, #{repairType}, #{remark},
+                #{communityId}, #{publicArea}, #{repairWay}, #{repairSettingType}, #{settingId}, #{isShow})
     </insert>
-
-
-
     <!-- 鏌ヨ鎶ヤ慨璁剧疆淇℃伅 add by wuxw 2018-07-03 -->
     <select id="getRepairSettingInfo" parameterType="Map" resultType="Map">
-        select  t.price_scope,t.price_scope priceScope,t.pay_fee_flag,t.pay_fee_flag payFeeFlag,t.return_visit_flag,t.return_visit_flag returnVisitFlag,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.community_id,t.community_id communityId,t.public_area,t.public_area publicArea,t.repair_way,t.repair_way repairWay,t.repair_setting_type,t.repair_setting_type repairSettingType,t.setting_id,t.setting_id settingId 
-from r_repair_setting t 
-where 1 =1 
-<if test="priceScope !=null and priceScope != ''">
-   and t.price_scope= #{priceScope}
-</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="repairTypeName !=null and repairTypeName != ''">
-   and t.repair_type_name= #{repairTypeName}
-</if> 
-<if test="repairType !=null and repairType != ''">
-   and t.repair_type= #{repairType}
-</if> 
-<if test="remark !=null and remark != ''">
-   and t.remark= #{remark}
-</if> 
-<if test="statusCd !=null and statusCd != ''">
-   and t.status_cd= #{statusCd}
-</if> 
-<if test="communityId !=null and communityId != ''">
-   and t.community_id= #{communityId}
-</if> 
-<if test="publicArea !=null and publicArea != ''">
-   and t.public_area= #{publicArea}
-</if> 
-<if test="repairWay !=null and repairWay != ''">
-   and t.repair_way= #{repairWay}
-</if> 
-<if test="repairSettingType !=null and repairSettingType != ''">
-   and t.repair_setting_type= #{repairSettingType}
-</if> 
-<if test="settingId !=null and settingId != ''">
-   and t.setting_id= #{settingId}
-</if> 
-order by t.create_time desc
-<if test="page != -1 and page != null ">
-   limit #{page}, #{row}
-</if> 
-
+        select t.price_scope,t.price_scope priceScope,t.pay_fee_flag,t.pay_fee_flag
+        payFeeFlag,t.return_visit_flag,t.return_visit_flag returnVisitFlag,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.community_id,t.community_id communityId,t.public_area,t.public_area
+        publicArea,t.repair_way,t.repair_way repairWay,t.repair_setting_type,t.repair_setting_type
+        repairSettingType,t.setting_id,t.setting_id settingId,t.is_show,t.is_show isShow
+        from r_repair_setting t
+        where 1 =1
+        <if test="priceScope !=null and priceScope != ''">
+            and t.price_scope= #{priceScope}
+        </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="repairTypeName !=null and repairTypeName != ''">
+            and t.repair_type_name= #{repairTypeName}
+        </if>
+        <if test="repairType !=null and repairType != ''">
+            and t.repair_type= #{repairType}
+        </if>
+        <if test="remark !=null and remark != ''">
+            and t.remark= #{remark}
+        </if>
+        <if test="statusCd !=null and statusCd != ''">
+            and t.status_cd= #{statusCd}
+        </if>
+        <if test="communityId !=null and communityId != ''">
+            and t.community_id= #{communityId}
+        </if>
+        <if test="publicArea !=null and publicArea != ''">
+            and t.public_area= #{publicArea}
+        </if>
+        <if test="repairWay !=null and repairWay != ''">
+            and t.repair_way= #{repairWay}
+        </if>
+        <if test="repairSettingType !=null and repairSettingType != ''">
+            and t.repair_setting_type= #{repairSettingType}
+        </if>
+        <if test="settingId !=null and settingId != ''">
+            and t.setting_id= #{settingId}
+        </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="updateRepairSettingInfo" parameterType="Map">
-        update  r_repair_setting t set t.status_cd = #{statusCd}
-<if test="newBId != null and newBId != ''">
-,t.b_id = #{newBId}
-</if> 
-<if test="priceScope !=null and priceScope != ''">
-, t.price_scope= #{priceScope}
-</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="repairTypeName !=null and repairTypeName != ''">
-, t.repair_type_name= #{repairTypeName}
-</if> 
-<if test="repairType !=null and repairType != ''">
-, t.repair_type= #{repairType}
-</if> 
-<if test="remark !=null and remark != ''">
-, t.remark= #{remark}
-</if> 
-<if test="communityId !=null and communityId != ''">
-, t.community_id= #{communityId}
-</if> 
-<if test="publicArea !=null and publicArea != ''">
-, t.public_area= #{publicArea}
-</if> 
-<if test="repairWay !=null and repairWay != ''">
-, t.repair_way= #{repairWay}
-</if> 
-<if test="repairSettingType !=null and repairSettingType != ''">
-, t.repair_setting_type= #{repairSettingType}
-</if> 
- where 1=1 <if test="settingId !=null and settingId != ''">
-and t.setting_id= #{settingId}
-</if> 
-
+        update r_repair_setting t set t.status_cd = #{statusCd}
+        <if test="newBId != null and newBId != ''">
+            ,t.b_id = #{newBId}
+        </if>
+        <if test="priceScope !=null and priceScope != ''">
+            , t.price_scope= #{priceScope}
+        </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="repairTypeName !=null and repairTypeName != ''">
+            , t.repair_type_name= #{repairTypeName}
+        </if>
+        <if test="repairType !=null and repairType != ''">
+            , t.repair_type= #{repairType}
+        </if>
+        <if test="remark !=null and remark != ''">
+            , t.remark= #{remark}
+        </if>
+        <if test="communityId !=null and communityId != ''">
+            , t.community_id= #{communityId}
+        </if>
+        <if test="publicArea !=null and publicArea != ''">
+            , t.public_area= #{publicArea}
+        </if>
+        <if test="repairWay !=null and repairWay != ''">
+            , t.repair_way= #{repairWay}
+        </if>
+        <if test="repairSettingType !=null and repairSettingType != ''">
+            , t.repair_setting_type= #{repairSettingType}
+        </if>
+        <if test="isShow !=null and isShow != ''">
+            , t.is_show= #{isShow}
+        </if>
+        where 1=1
+        <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 
-where 1 =1 
-<if test="priceScope !=null and priceScope != ''">
-   and t.price_scope= #{priceScope}
-</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="repairTypeName !=null and repairTypeName != ''">
-   and t.repair_type_name= #{repairTypeName}
-</if> 
-<if test="repairType !=null and repairType != ''">
-   and t.repair_type= #{repairType}
-</if> 
-<if test="remark !=null and remark != ''">
-   and t.remark= #{remark}
-</if> 
-<if test="statusCd !=null and statusCd != ''">
-   and t.status_cd= #{statusCd}
-</if> 
-<if test="communityId !=null and communityId != ''">
-   and t.community_id= #{communityId}
-</if> 
-<if test="publicArea !=null and publicArea != ''">
-   and t.public_area= #{publicArea}
-</if> 
-<if test="repairWay !=null and repairWay != ''">
-   and t.repair_way= #{repairWay}
-</if> 
-<if test="repairSettingType !=null and repairSettingType != ''">
-   and t.repair_setting_type= #{repairSettingType}
-</if> 
-<if test="settingId !=null and settingId != ''">
-   and t.setting_id= #{settingId}
-</if> 
-
-
-     </select>
-
+    <select id="queryRepairSettingsCount" parameterType="Map" resultType="Map">
+        select count(1) count
+        from r_repair_setting t
+        where 1 =1
+        <if test="priceScope !=null and priceScope != ''">
+            and t.price_scope= #{priceScope}
+        </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="repairTypeName !=null and repairTypeName != ''">
+            and t.repair_type_name= #{repairTypeName}
+        </if>
+        <if test="repairType !=null and repairType != ''">
+            and t.repair_type= #{repairType}
+        </if>
+        <if test="remark !=null and remark != ''">
+            and t.remark= #{remark}
+        </if>
+        <if test="statusCd !=null and statusCd != ''">
+            and t.status_cd= #{statusCd}
+        </if>
+        <if test="communityId !=null and communityId != ''">
+            and t.community_id= #{communityId}
+        </if>
+        <if test="publicArea !=null and publicArea != ''">
+            and t.public_area= #{publicArea}
+        </if>
+        <if test="repairWay !=null and repairWay != ''">
+            and t.repair_way= #{repairWay}
+        </if>
+        <if test="repairSettingType !=null and repairSettingType != ''">
+            and t.repair_setting_type= #{repairSettingType}
+        </if>
+        <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>
 </mapper>

--
Gitblit v1.8.0