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/fee/TempCarFeeConfigAttrServiceDaoImplMapper.xml |  282 +++++++++++++++++++++++++++++---------------------------
 1 files changed, 145 insertions(+), 137 deletions(-)

diff --git a/java110-db/src/main/resources/mapper/fee/TempCarFeeConfigAttrServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/fee/TempCarFeeConfigAttrServiceDaoImplMapper.xml
old mode 100644
new mode 100755
index 7b5cbcb..528cedf
--- a/java110-db/src/main/resources/mapper/fee/TempCarFeeConfigAttrServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/fee/TempCarFeeConfigAttrServiceDaoImplMapper.xml
@@ -5,168 +5,176 @@
 <mapper namespace="tempCarFeeConfigAttrServiceDaoImpl">
 
     <!-- 淇濆瓨涓存椂杞︽敹璐规爣鍑嗗睘鎬т俊鎭� add by wuxw 2018-07-03 -->
-       <insert id="saveBusinessTempCarFeeConfigAttrInfo" parameterType="Map">
-           insert into business_temp_car_fee_config_attr(
-attr_id,operate,create_time,config_id,spec_cd,b_id,value
-) values (
-#{attrId},#{operate},#{createTime},#{configId},#{specCd},#{bId},#{value}
-)
-       </insert>
+    <insert id="saveBusinessTempCarFeeConfigAttrInfo" parameterType="Map">
+        insert into business_temp_car_fee_config_attr(
+        attr_id,operate,config_id,spec_cd,b_id,value,community_id
+        ) values (
+        #{attrId},#{operate},#{configId},#{specCd},#{bId},#{value},#{communityId}
+        )
+    </insert>
 
 
-       <!-- 鏌ヨ涓存椂杞︽敹璐规爣鍑嗗睘鎬т俊鎭紙Business锛� add by wuxw 2018-07-03 -->
-       <select id="getBusinessTempCarFeeConfigAttrInfo" parameterType="Map" resultType="Map">
-           select  t.attr_id,t.attr_id attrId,t.operate,t.create_time,t.create_time createTime,t.config_id,t.config_id configId,t.spec_cd,t.spec_cd specCd,t.b_id,t.b_id bId,t.value 
-from business_temp_car_fee_config_attr t 
-where 1 =1 
-<if test="attrId !=null and attrId != ''">
-   and t.attr_id= #{attrId}
-</if> 
-<if test="operate !=null and operate != ''">
-   and t.operate= #{operate}
-</if> 
-<if test="createTime !=null and createTime != ''">
-   and t.create_time= #{createTime}
-</if> 
-<if test="configId !=null and configId != ''">
-   and t.config_id= #{configId}
-</if> 
-<if test="specCd !=null and specCd != ''">
-   and t.spec_cd= #{specCd}
-</if> 
-<if test="bId !=null and bId != ''">
-   and t.b_id= #{bId}
-</if> 
-<if test="value !=null and value != ''">
-   and t.value= #{value}
-</if> 
+    <!-- 鏌ヨ涓存椂杞︽敹璐规爣鍑嗗睘鎬т俊鎭紙Business锛� add by wuxw 2018-07-03 -->
+    <select id="getBusinessTempCarFeeConfigAttrInfo" parameterType="Map" resultType="Map">
+        select t.attr_id,t.attr_id attrId,t.operate,t.create_time,t.create_time createTime,t.config_id,t.config_id
+        configId,t.spec_cd,t.spec_cd specCd,t.b_id,t.b_id bId,t.value,t.community_id
+        from business_temp_car_fee_config_attr t
+        where 1 =1
+        <if test="attrId !=null and attrId != ''">
+            and t.attr_id= #{attrId}
+        </if>
+        <if test="operate !=null and operate != ''">
+            and t.operate= #{operate}
+        </if>
+        <if test="createTime !=null">
+            and t.create_time= #{createTime}
+        </if>
+        <if test="configId !=null and configId != ''">
+            and t.config_id= #{configId}
+        </if>
+        <if test="specCd !=null and specCd != ''">
+            and t.spec_cd= #{specCd}
+        </if>
+        <if test="bId !=null and bId != ''">
+            and t.b_id= #{bId}
+        </if>
+        <if test="value !=null and value != ''">
+            and t.value= #{value}
+        </if>
 
-       </select>
-
-
-
+    </select>
 
 
     <!-- 淇濆瓨涓存椂杞︽敹璐规爣鍑嗗睘鎬т俊鎭嚦 instance琛ㄤ腑 add by wuxw 2018-07-03 -->
     <insert id="saveTempCarFeeConfigAttrInfoInstance" parameterType="Map">
         insert into temp_car_fee_config_attr(
-attr_id,create_time,config_id,spec_cd,status_cd,b_id,value
-) select t.attr_id,t.create_time,t.config_id,t.spec_cd,'0',t.b_id,t.value from business_temp_car_fee_config_attr t where 1=1
-<if test="attrId !=null and attrId != ''">
-   and t.attr_id= #{attrId}
-</if> 
-   and t.operate= 'ADD'
-<if test="createTime !=null and createTime != ''">
-   and t.create_time= #{createTime}
-</if> 
-<if test="configId !=null and configId != ''">
-   and t.config_id= #{configId}
-</if> 
-<if test="specCd !=null and specCd != ''">
-   and t.spec_cd= #{specCd}
-</if> 
-<if test="bId !=null and bId != ''">
-   and t.b_id= #{bId}
-</if> 
-<if test="value !=null and value != ''">
-   and t.value= #{value}
-</if> 
+        attr_id,config_id,spec_cd,status_cd,b_id,value,community_id
+        ) select t.attr_id,t.config_id,t.spec_cd,'0',t.b_id,t.value,t.community_id
+        from business_temp_car_fee_config_attr
+        t where 1=1
+        <if test="attrId !=null and attrId != ''">
+            and t.attr_id= #{attrId}
+        </if>
+        and t.operate= 'ADD'
+        <if test="createTime !=null ">
+            and t.create_time= #{createTime}
+        </if>
+        <if test="configId !=null and configId != ''">
+            and t.config_id= #{configId}
+        </if>
+        <if test="specCd !=null and specCd != ''">
+            and t.spec_cd= #{specCd}
+        </if>
+        <if test="bId !=null and bId != ''">
+            and t.b_id= #{bId}
+        </if>
+        <if test="value !=null and value != ''">
+            and t.value= #{value}
+        </if>
 
     </insert>
 
 
-
     <!-- 鏌ヨ涓存椂杞︽敹璐规爣鍑嗗睘鎬т俊鎭� add by wuxw 2018-07-03 -->
     <select id="getTempCarFeeConfigAttrInfo" parameterType="Map" resultType="Map">
-        select  t.attr_id,t.attr_id attrId,t.create_time,t.create_time createTime,t.config_id,t.config_id configId,t.spec_cd,t.spec_cd specCd,t.status_cd,t.status_cd statusCd,t.b_id,t.b_id bId,t.value 
-from temp_car_fee_config_attr t 
-where 1 =1 
-<if test="attrId !=null and attrId != ''">
-   and t.attr_id= #{attrId}
-</if> 
-<if test="createTime !=null and createTime != ''">
-   and t.create_time= #{createTime}
-</if> 
-<if test="configId !=null and configId != ''">
-   and t.config_id= #{configId}
-</if> 
-<if test="specCd !=null and specCd != ''">
-   and t.spec_cd= #{specCd}
-</if> 
-<if test="statusCd !=null and statusCd != ''">
-   and t.status_cd= #{statusCd}
-</if> 
-<if test="bId !=null and bId != ''">
-   and t.b_id= #{bId}
-</if> 
-<if test="value !=null and value != ''">
-   and t.value= #{value}
-</if> 
-order by t.create_time desc
-<if test="page != -1 and page != null ">
-   limit #{page}, #{row}
-</if> 
+        select t.attr_id,t.attr_id attrId,t.create_time,t.create_time createTime,t.config_id,t.config_id
+        configId,t.spec_cd,t.spec_cd specCd,t.status_cd,t.status_cd statusCd,t.b_id,t.b_id bId,t.value,
+        t.community_id,t.community_id communityId,tcfrs.spec_name specName
+        from temp_car_fee_config_attr t
+        left join temp_car_fee_config tcfc on t.config_id = tcfc.config_id and tcfc.status_cd = '0'
+        LEFT JOIN temp_car_fee_rule_spec tcfrs on tcfc.rule_id = tcfrs.rule_id and t.spec_cd = tcfrs.spec_id
+        where 1 =1
+        <if test="attrId !=null and attrId != ''">
+            and t.attr_id= #{attrId}
+        </if>
+        <if test="createTime !=null and createTime != ''">
+            and t.create_time= #{createTime}
+        </if>
+        <if test="configId !=null and configId != ''">
+            and t.config_id= #{configId}
+        </if>
+        <if test="specCd !=null and specCd != ''">
+            and t.spec_cd= #{specCd}
+        </if>
+        <if test="statusCd !=null and statusCd != ''">
+            and t.status_cd= #{statusCd}
+        </if>
+        <if test="bId !=null and bId != ''">
+            and t.b_id= #{bId}
+        </if>
+        <if test="value !=null and value != ''">
+            and t.value= #{value}
+        </if>
+        <if test="communityId !=null and communityId != ''">
+            and t.community_id= #{communityId}
+        </if>
+        order by tcfrs.seq
+        <if test="page != -1 and page != null ">
+            limit #{page}, #{row}
+        </if>
 
     </select>
 
 
-
-
     <!-- 淇敼涓存椂杞︽敹璐规爣鍑嗗睘鎬т俊鎭� add by wuxw 2018-07-03 -->
     <update id="updateTempCarFeeConfigAttrInfoInstance" parameterType="Map">
-        update  temp_car_fee_config_attr t set t.status_cd = #{statusCd}
-<if test="newBId != null and newBId != ''">
-,t.b_id = #{newBId}
-</if> 
-<if test="createTime !=null and createTime != ''">
-, t.create_time= #{createTime}
-</if> 
-<if test="configId !=null and configId != ''">
-, t.config_id= #{configId}
-</if> 
-<if test="specCd !=null and specCd != ''">
-, t.spec_cd= #{specCd}
-</if> 
-<if test="value !=null and value != ''">
-, t.value= #{value}
-</if> 
- where 1=1 <if test="attrId !=null and attrId != ''">
-and t.attr_id= #{attrId}
-</if> 
-<if test="bId !=null and bId != ''">
-and t.b_id= #{bId}
-</if> 
+        update temp_car_fee_config_attr t set t.status_cd = #{statusCd}
+        <if test="newBId != null and newBId != ''">
+            ,t.b_id = #{newBId}
+        </if>
+        <if test="configId !=null and configId != ''">
+            , t.config_id= #{configId}
+        </if>
+        <if test="specCd !=null and specCd != ''">
+            , t.spec_cd= #{specCd}
+        </if>
+        <if test="value !=null and value != ''">
+            , t.value= #{value}
+        </if>
+        where 1=1
+        <if test="attrId !=null and attrId != ''">
+            and t.attr_id= #{attrId}
+        </if>
+        <if test="bId !=null and bId != ''">
+            and t.b_id= #{bId}
+        </if>
+        <if test="communityId !=null and communityId != ''">
+            and t.community_id= #{communityId}
+        </if>
 
     </update>
 
     <!-- 鏌ヨ涓存椂杞︽敹璐规爣鍑嗗睘鎬ф暟閲� add by wuxw 2018-07-03 -->
-     <select id="queryTempCarFeeConfigAttrsCount" parameterType="Map" resultType="Map">
-        select  count(1) count 
-from temp_car_fee_config_attr t 
-where 1 =1 
-<if test="attrId !=null and attrId != ''">
-   and t.attr_id= #{attrId}
-</if> 
-<if test="createTime !=null and createTime != ''">
-   and t.create_time= #{createTime}
-</if> 
-<if test="configId !=null and configId != ''">
-   and t.config_id= #{configId}
-</if> 
-<if test="specCd !=null and specCd != ''">
-   and t.spec_cd= #{specCd}
-</if> 
-<if test="statusCd !=null and statusCd != ''">
-   and t.status_cd= #{statusCd}
-</if> 
-<if test="bId !=null and bId != ''">
-   and t.b_id= #{bId}
-</if> 
-<if test="value !=null and value != ''">
-   and t.value= #{value}
-</if> 
+    <select id="queryTempCarFeeConfigAttrsCount" parameterType="Map" resultType="Map">
+        select count(1) count
+        from temp_car_fee_config_attr t
+        where 1 =1
+        <if test="attrId !=null and attrId != ''">
+            and t.attr_id= #{attrId}
+        </if>
+        <if test="createTime !=null ">
+            and t.create_time= #{createTime}
+        </if>
+        <if test="configId !=null and configId != ''">
+            and t.config_id= #{configId}
+        </if>
+        <if test="specCd !=null and specCd != ''">
+            and t.spec_cd= #{specCd}
+        </if>
+        <if test="statusCd !=null and statusCd != ''">
+            and t.status_cd= #{statusCd}
+        </if>
+        <if test="bId !=null and bId != ''">
+            and t.b_id= #{bId}
+        </if>
+        <if test="value !=null and value != ''">
+            and t.value= #{value}
+        </if>
+        <if test="communityId !=null and communityId != ''">
+            and t.community_id= #{communityId}
+        </if>
 
 
-     </select>
+    </select>
 
 </mapper>

--
Gitblit v1.8.0