From b6184e2ddf3db37a94f7efb3b619bbc64642a292 Mon Sep 17 00:00:00 2001
From: chengf <cgf12138@163.com>
Date: 星期二, 27 一月 2026 18:12:48 +0800
Subject: [PATCH] Z四

---
 java110-db/src/main/resources/mapper/fee/FeeConfigServiceDaoImplMapper.xml |  406 +++++++++++++++++++++++++++++++++++++++++++++++++--------
 1 files changed, 346 insertions(+), 60 deletions(-)

diff --git a/java110-db/src/main/resources/mapper/fee/FeeConfigServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/fee/FeeConfigServiceDaoImplMapper.xml
old mode 100644
new mode 100755
index 4495f66..c0f56e5
--- a/java110-db/src/main/resources/mapper/fee/FeeConfigServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/fee/FeeConfigServiceDaoImplMapper.xml
@@ -1,27 +1,32 @@
 <?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="feeConfigServiceDaoImpl">
 
     <!-- 淇濆瓨璐圭敤閰嶇疆淇℃伅 add by wuxw 2018-07-03 -->
     <insert id="saveBusinessFeeConfigInfo" parameterType="Map">
-        insert into business_pay_fee_config(
-        fee_type_cd,computing_formula,additional_amount,square_price,is_default,operate,config_id,fee_flag,fee_name,start_time,end_time,community_id,b_id
-        ) values (
-        #{feeTypeCd},#{computingFormula},#{additionalAmount},#{squarePrice},#{isDefault},#{operate},#{configId},#{feeFlag},#{feeName},#{startTime},#{endTime},#{communityId},#{bId}
-        )
+        insert into business_pay_fee_config(fee_type_cd, computing_formula, additional_amount, square_price, is_default,
+                                            operate, config_id, fee_flag, fee_name,
+                                            start_time, end_time, community_id, b_id, bill_type, payment_cd,
+                                            payment_cycle, computing_formula_text, deduct_from, prepayment_period)
+        values (#{feeTypeCd}, #{computingFormula}, #{additionalAmount}, #{squarePrice}, #{isDefault}, #{operate},
+                #{configId}, #{feeFlag}, #{feeName}, #{startTime}, #{endTime}, #{communityId}, #{bId}, #{billType},
+                #{paymentCd}, #{paymentCycle}, #{computingFormulaText}, #{deductFrom}, #{prepaymentPeriod})
     </insert>
-
 
     <!-- 鏌ヨ璐圭敤閰嶇疆淇℃伅锛圔usiness锛� add by wuxw 2018-07-03 -->
     <select id="getBusinessFeeConfigInfo" parameterType="Map" resultType="Map">
-        select t.fee_type_cd,t.fee_type_cd feeTypeCd,t.computing_formula,t.computing_formula
-        computingFormula,t.additional_amount,t.additional_amount additionalAmount,t.square_price,t.square_price
+        select t.fee_type_cd,t.fee_type_cd feeTypeCd,
+        t.secondary_fee_type_cd,t.secondary_fee_type_cd secondaryFeeTypeCd,s.secondary_fee_type_cd_name,s.secondary_fee_type_cd_name secondaryFeeTypeCdName,
+        t.computing_formula,t.computing_formula computingFormula,t.additional_amount,t.additional_amount additionalAmount,t.square_price,t.square_price
         squarePrice,t.is_default,t.is_default isDefault,t.operate,t.config_id,t.config_id configId,t.fee_flag,t.fee_flag
         feeFlag,t.fee_name,t.fee_name feeName,t.start_time,t.start_time startTime,t.end_time,t.end_time
-        endTime,t.community_id,t.community_id communityId,t.b_id,t.b_id bId
+        endTime,t.community_id,t.community_id communityId,t.b_id,t.b_id bId,t.bill_type,t.bill_type billType,
+        t.payment_cd,t.payment_cycle,t.computing_formula_text,t.computing_formula_text
+        computingFormulaText,t.deduct_from,t.deduct_from deductFrom,t.pay_online payOnline,t.scale,t.decimal_place
+        decimalPlace,t.units,t.prepayment_period,t.prepayment_period prepaymentPeriod
         from business_pay_fee_config t
+        left join secondary_fee_type_cd_tb s on s.secondary_fee_type_cd = t.secondary_fee_type_cd
         where 1 =1
         <if test="feeTypeCd !=null and feeTypeCd != ''">
             and t.fee_type_cd= #{feeTypeCd}
@@ -29,10 +34,10 @@
         <if test="computingFormula !=null and computingFormula != ''">
             and t.computing_formula= #{computingFormula}
         </if>
-        <if test="additionalAmount !=null and additionalAmount != ''">
+        <if test="additionalAmount !=null and additionalAmount != '' or additionalAmount == 0">
             and t.additional_amount= #{additionalAmount}
         </if>
-        <if test="squarePrice !=null and squarePrice != ''">
+        <if test="squarePrice !=null and squarePrice != '' or squarePrice == 0">
             and t.square_price= #{squarePrice}
         </if>
         <if test="isDefault !=null and isDefault != ''">
@@ -48,12 +53,15 @@
             and t.fee_flag= #{feeFlag}
         </if>
         <if test="feeName !=null and feeName != ''">
-            and t.fee_name= #{feeName}
+            and t.fee_name like '%${feeName}%'
         </if>
-        <if test="startTime !=null and startTime != ''">
+        <if test="billType !=null and billType != ''">
+            and t.bill_type= #{billType}
+        </if>
+        <if test="startTime !=null ">
             and t.start_time= #{startTime}
         </if>
-        <if test="endTime !=null and endTime != ''">
+        <if test="endTime !=null ">
             and t.end_time= #{endTime}
         </if>
         <if test="communityId !=null and communityId != ''">
@@ -62,16 +70,23 @@
         <if test="bId !=null and bId != ''">
             and t.b_id= #{bId}
         </if>
-
+        <if test="deductFrom !=null and deductFrom != ''">
+            and t.deduct_from = #{deductFrom}
+        </if>
+        <if test="prepaymentPeriod !=null and prepaymentPeriod != ''">
+            and t.prepayment_period = #{prepaymentPeriod}
+        </if>
     </select>
-
 
     <!-- 淇濆瓨璐圭敤閰嶇疆淇℃伅鑷� instance琛ㄤ腑 add by wuxw 2018-07-03 -->
     <insert id="saveFeeConfigInfoInstance" parameterType="Map">
         insert into pay_fee_config(
-        fee_type_cd,computing_formula,additional_amount,status_cd,square_price,is_default,config_id,fee_flag,fee_name,start_time,end_time,community_id,b_id
+        fee_type_cd,computing_formula,additional_amount,status_cd,square_price,is_default,config_id,fee_flag,fee_name,
+        start_time,end_time,community_id,b_id,bill_type,payment_cd,payment_cycle,computing_formula_text,deduct_from,prepayment_period
         ) select
-        t.fee_type_cd,t.computing_formula,t.additional_amount,'0',t.square_price,t.is_default,t.config_id,t.fee_flag,t.fee_name,t.start_time,t.end_time,t.community_id,t.b_id
+        t.fee_type_cd,t.computing_formula,t.additional_amount,'0',t.square_price,t.is_default,t.config_id,t.fee_flag,t.fee_name,
+        t.start_time,t.end_time,t.community_id,
+        t.b_id,t.bill_type,t.payment_cd,t.payment_cycle,t.computing_formula_text,t.deduct_from,t.prepayment_period
         from business_pay_fee_config t where 1=1
         <if test="feeTypeCd !=null and feeTypeCd != ''">
             and t.fee_type_cd= #{feeTypeCd}
@@ -98,10 +113,13 @@
         <if test="feeName !=null and feeName != ''">
             and t.fee_name= #{feeName}
         </if>
-        <if test="startTime !=null and startTime != ''">
+        <if test="billType !=null and billType != ''">
+            and t.bill_type= #{billType}
+        </if>
+        <if test="startTime !=null ">
             and t.start_time= #{startTime}
         </if>
-        <if test="endTime !=null and endTime != ''">
+        <if test="endTime !=null ">
             and t.end_time= #{endTime}
         </if>
         <if test="communityId !=null and communityId != ''">
@@ -110,28 +128,159 @@
         <if test="bId !=null and bId != ''">
             and t.b_id= #{bId}
         </if>
-
+        <if test="prepaymentPeriod !=null and prepaymentPeriod != ''">
+            and t.prepayment_period = #{prepaymentPeriod}
+        </if>
     </insert>
-
-
     <!-- 鏌ヨ璐圭敤閰嶇疆淇℃伅 add by wuxw 2018-07-03 -->
     <select id="getFeeConfigInfo" parameterType="Map" resultType="Map">
-        select t.fee_type_cd,t.fee_type_cd feeTypeCd,t.computing_formula,t.computing_formula
+        select t.fee_type_cd,t.fee_type_cd feeTypeCd,t.secondary_fee_type_cd,
+               t.secondary_fee_type_cd secondaryFeeTypeCd,s.secondary_fee_type_cd_name,s.secondary_fee_type_cd_name secondaryFeeTypeCdName,
+               s.is_contract_fee ,s.is_contract_fee isContractFee,
+               t.computing_formula,t.computing_formula
         computingFormula,t.additional_amount,t.additional_amount additionalAmount,t.status_cd,t.status_cd
         statusCd,t.square_price,t.square_price squarePrice,t.is_default,t.is_default isDefault,t.config_id,t.config_id
         configId,t.fee_flag,t.fee_flag feeFlag,t.fee_name,t.fee_name feeName,t.start_time,t.start_time
         startTime,t.end_time,t.end_time endTime,t.community_id,t.community_id communityId,t.b_id,t.b_id bId,
-        td1.name feeTypeCdName,td2.name feeFlagName
-        from pay_fee_config t,t_dict td1,t_dict td2
-        where 1 =1
-        and t.fee_type_cd = td1.status_cd
-        and td1.table_name = 'pay_fee_config'
-        and td1.table_columns = 'fee_type_cd'
-        and t.fee_flag = td2.status_cd
-        and td2.table_name = 'pay_fee_config'
-        and td2.table_columns = 'fee_flag'
+        td1.name feeTypeCdName,td2.name feeFlagName,t.bill_type billType,t.bill_type,td3.name billTypeName,
+        t.payment_cd,t.payment_cycle,t.payment_cd paymentCd,t.payment_cycle paymentCycle,
+        t.computing_formula_text,t.computing_formula_text computingFormulaText,t.deduct_from,t.deduct_from
+        deductFrom,td4.name computingFormulaName,t.pay_online payOnline,t.scale,t.decimal_place decimalPlace,t.units,
+        t.prepayment_period,t.prepayment_period prepaymentPeriod,t.state
+        from pay_fee_config t
+        left join secondary_fee_type_cd_tb s on s.secondary_fee_type_cd = t.secondary_fee_type_cd
+        left join t_dict td1 on t.fee_type_cd = td1.status_cd and td1.table_name = 'pay_fee_config' and
+        td1.table_columns = 'fee_type_cd'
+        left join t_dict td2 on t.fee_flag = td2.status_cd and td2.table_name = 'pay_fee_config' and td2.table_columns =
+        'fee_flag'
+        left join t_dict td3 on t.bill_type = td3.status_cd and td3.table_name = 'pay_fee_config' and td3.table_columns
+        = 'bill_type'
+        left join t_dict td4 on t.computing_formula = td4.status_cd and td4.table_name = 'pay_fee_config' and
+        td4.table_columns = 'computing_formula'
+        where 1 = 1
         <if test="feeTypeCd !=null and feeTypeCd != ''">
-            and t.fee_type_cd= #{feeTypeCd}
+          <choose>
+              <when test="feeTypeCd == 0">
+                  and t.fee_type_cd in ('630000003','630000004','630000005')
+              </when>
+              <otherwise>
+                  and t.fee_type_cd= #{feeTypeCd}
+              </otherwise>
+          </choose>
+        </if>
+        <if test="feeTypeCds !=null">
+            and t.fee_type_cd in
+            <foreach collection="feeTypeCds" item="item" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="secondaryFeeTypeCd !=null and secondaryFeeTypeCd != ''">
+            and t.secondary_fee_type_cd= #{secondaryFeeTypeCd}
+        </if>
+        <if test="computingFormula !=null and computingFormula != ''">
+            and t.computing_formula= #{computingFormula}
+        </if>
+        <if test="additionalAmount !=null and additionalAmount != ''">
+            and t.additional_amount= #{additionalAmount}
+        </if>
+        <if test="statusCd !=null and statusCd != ''">
+            and t.status_cd= #{statusCd}
+        </if>
+        <if test="squarePrice !=null and squarePrice != ''">
+            and t.square_price= #{squarePrice}
+        </if>
+        <if test="isDefault !=null and isDefault != ''">
+            and t.is_default= #{isDefault}
+        </if>
+        <if test="configId !=null and configId != ''">
+            and t.config_id= #{configId}
+        </if>
+<!--        <if test="feeFlag !=null and feeFlag != ''">-->
+<!--            and t.fee_flag= #{feeFlag}-->
+<!--        </if>-->
+        <if test="feeName !=null and feeName != ''">
+            and t.fee_name like '%${feeName}%'
+        </if>
+        <if test="feeNameEq !=null and feeNameEq != ''">
+            and t.fee_name = #{feeNameEq}
+        </if>
+        <if test="startTime !=null ">
+            and t.start_time= #{startTime}
+        </if>
+        <if test="endTime !=null ">
+            and t.end_time= #{endTime}
+        </if>
+        <if test="valid !=null and valid == 1">
+            and t.end_time &gt; now()
+        </if>
+        <if test="curTime !=null ">
+            and t.end_time &gt; #{curTime}
+            and t.start_time &lt; #{curTime}
+        </if>
+        <if test="communityId !=null and communityId != ''">
+            and t.community_id in (#{communityId}, '9999')
+        </if>
+        <if test="communityIds !=null">
+            and t.community_id in
+            <foreach collection="communityIds" item="item" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="bId !=null and bId != ''">
+            and t.b_id= #{bId}
+        </if>
+        <if test="paymentCd !=null and paymentCd != ''">
+            and t.payment_cd= #{paymentCd}
+        </if>
+        <if test="paymentCycle !=null and paymentCycle != ''">
+            and t.payment_cycle= #{paymentCycle}
+        </if>
+        <if test="billType !=null and billType != ''">
+            and t.bill_type= #{billType}
+        </if>
+        <if test="deductFrom !=null and deductFrom != ''">
+            and t.deduct_from = #{deductFrom}
+        </if>
+        <if test="prepaymentPeriod !=null and prepaymentPeriod != ''">
+            and t.prepayment_period = #{prepaymentPeriod}
+        </if>
+        <if test="state !=null and state != ''">
+            and t.state = #{state}
+        </if>
+        <if test="feeTypeCdName != null">
+            and td1.name = #{feeTypeCdName}
+        </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 -->
+    <select id="getFeeConfigInfoByCar" parameterType="Map" resultType="Map">
+        select t.fee_type_cd,t.fee_type_cd feeTypeCd,t.secondary_fee_type_cd,t.secondary_fee_type_cd secondaryFeeTypeCd,s.secondary_fee_type_cd_name,s.secondary_fee_type_cd_name secondaryFeeTypeCdName,t.computing_formula,t.computing_formula
+        computingFormula,t.additional_amount,t.additional_amount additionalAmount,t.status_cd,t.status_cd
+        statusCd,t.square_price,t.square_price squarePrice,t.is_default,t.is_default isDefault,t.config_id,t.config_id
+        configId,t.fee_flag,t.fee_flag feeFlag,t.fee_name,t.fee_name feeName,t.start_time,t.start_time
+        startTime,t.end_time,t.end_time endTime,t.community_id,t.community_id communityId,t.b_id,t.b_id bId,
+        td1.name feeTypeCdName,td2.name feeFlagName,t.bill_type billType,t.bill_type,td3.name billTypeName,
+        t.payment_cd,t.payment_cycle,t.payment_cd paymentCd,t.payment_cycle paymentCycle,
+        t.computing_formula_text,t.computing_formula_text computingFormulaText,t.deduct_from,t.deduct_from
+        deductFrom,td4.name computingFormulaName,t.pay_online payOnline,t.scale,t.decimal_place decimalPlace,t.units,
+        t.prepayment_period,t.prepayment_period prepaymentPeriod,t.state
+        from pay_fee_config t
+        left join secondary_fee_type_cd_tb s on s.secondary_fee_type_cd = t.secondary_fee_type_cd
+        left join t_dict td1 on t.fee_type_cd = td1.status_cd and td1.table_name = 'pay_fee_config' and
+        td1.table_columns = 'fee_type_cd'
+        left join t_dict td2 on t.fee_flag = td2.status_cd and td2.table_name = 'pay_fee_config' and td2.table_columns =
+        'fee_flag'
+        left join t_dict td3 on t.bill_type = td3.status_cd and td3.table_name = 'pay_fee_config' and td3.table_columns
+        = 'bill_type'
+        left join t_dict td4 on t.computing_formula = td4.status_cd and td4.table_name = 'pay_fee_config' and
+        td4.table_columns = 'computing_formula'
+        where t.fee_type_cd in ('630000003','630000004','630000005')
+        <if test="secondaryFeeTypeCd !=null and secondaryFeeTypeCd != ''">
+            and t.secondary_fee_type_cd= #{secondaryFeeTypeCd}
         </if>
         <if test="computingFormula !=null and computingFormula != ''">
             and t.computing_formula= #{computingFormula}
@@ -155,27 +304,59 @@
             and t.fee_flag= #{feeFlag}
         </if>
         <if test="feeName !=null and feeName != ''">
-            and t.fee_name= #{feeName}
+            and t.fee_name like '%${feeName}%'
         </if>
-        <if test="startTime !=null and startTime != ''">
+        <if test="feeNameEq !=null and feeNameEq != ''">
+            and t.fee_name = #{feeNameEq}
+        </if>
+        <if test="startTime !=null ">
             and t.start_time= #{startTime}
         </if>
-        <if test="endTime !=null and endTime != ''">
+        <if test="endTime !=null ">
             and t.end_time= #{endTime}
+        </if>
+        <if test="valid !=null and valid == 1">
+            and t.end_time &gt; now()
+        </if>
+        <if test="curTime !=null ">
+            and t.end_time &gt; #{curTime}
+            and t.start_time &lt; #{curTime}
         </if>
         <if test="communityId !=null and communityId != ''">
             and t.community_id= #{communityId}
         </if>
+        <if test="communityIds !=null">
+            and t.community_id in
+            <foreach collection="communityIds" item="item" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
         <if test="bId !=null and bId != ''">
             and t.b_id= #{bId}
+        </if>
+        <if test="paymentCd !=null and paymentCd != ''">
+            and t.payment_cd= #{paymentCd}
+        </if>
+        <if test="paymentCycle !=null and paymentCycle != ''">
+            and t.payment_cycle= #{paymentCycle}
+        </if>
+        <if test="billType !=null and billType != ''">
+            and t.bill_type= #{billType}
+        </if>
+        <if test="deductFrom !=null and deductFrom != ''">
+            and t.deduct_from = #{deductFrom}
+        </if>
+        <if test="prepaymentPeriod !=null and prepaymentPeriod != ''">
+            and t.prepayment_period = #{prepaymentPeriod}
+        </if>
+        <if test="state !=null and state != ''">
+            and t.state = #{state}
         </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="updateFeeConfigInfoInstance" parameterType="Map">
@@ -186,14 +367,26 @@
         <if test="feeTypeCd !=null and feeTypeCd != ''">
             , t.fee_type_cd= #{feeTypeCd}
         </if>
+        <if test="secondaryFeeTypeCd !=null and secondaryFeeTypeCd != ''">
+            , t.secondary_fee_type_cd= #{secondaryFeeTypeCd}
+        </if>
         <if test="computingFormula !=null and computingFormula != ''">
             , t.computing_formula= #{computingFormula}
         </if>
-        <if test="additionalAmount !=null and additionalAmount != ''">
+        <if test="computingFormulaText !=null and computingFormulaText != ''">
+            , t.computing_formula_text= #{computingFormulaText}
+        </if>
+        <if test="additionalAmount !=null and additionalAmount != '' or additionalAmount == 0">
             , t.additional_amount= #{additionalAmount}
         </if>
-        <if test="squarePrice !=null and squarePrice != ''">
+        <if test="squarePrice !=null and squarePrice != '' or squarePrice == 0">
             , t.square_price= #{squarePrice}
+        </if>
+        <if test="paymentCd !=null and paymentCd != ''">
+            , t.payment_cd= #{paymentCd}
+        </if>
+        <if test="paymentCycle !=null and paymentCycle != ''">
+            , t.payment_cycle= #{paymentCycle}
         </if>
         <if test="isDefault !=null and isDefault != ''">
             , t.is_default= #{isDefault}
@@ -204,14 +397,26 @@
         <if test="feeName !=null and feeName != ''">
             , t.fee_name= #{feeName}
         </if>
-        <if test="startTime !=null and startTime != ''">
+        <if test="billType !=null and billType != ''">
+            , t.bill_type= #{billType}
+        </if>
+        <if test="startTime !=null ">
             , t.start_time= #{startTime}
         </if>
-        <if test="endTime !=null and endTime != ''">
+        <if test="endTime !=null ">
             , t.end_time= #{endTime}
         </if>
         <if test="communityId !=null and communityId != ''">
             , t.community_id= #{communityId}
+        </if>
+        <if test="deductFrom !=null and deductFrom != ''">
+            , t.deduct_from= #{deductFrom}
+        </if>
+        <if test="prepaymentPeriod !=null and prepaymentPeriod != ''">
+            , t.prepayment_period = #{prepaymentPeriod}
+        </if>
+        <if test="state !=null and state != ''">
+            , t.state = #{state}
         </if>
         where 1=1
         <if test="configId !=null and configId != ''">
@@ -220,22 +425,26 @@
         <if test="bId !=null and bId != ''">
             and t.b_id= #{bId}
         </if>
-
     </update>
 
     <!-- 鏌ヨ璐圭敤閰嶇疆鏁伴噺 add by wuxw 2018-07-03 -->
     <select id="queryFeeConfigsCount" parameterType="Map" resultType="Map">
         select count(1) count
-        from pay_fee_config t,t_dict td1,t_dict td2
-        where 1 =1
-        and t.fee_type_cd = td1.status_cd
-        and td1.table_name = 'pay_fee_config'
-        and td1.table_columns = 'fee_type_cd'
-        and t.fee_flag = td2.status_cd
-        and td2.table_name = 'pay_fee_config'
-        and td2.table_columns = 'fee_flag'
+        from pay_fee_config t
+        left join t_dict td1 on t.fee_type_cd = td1.status_cd and td1.table_name = 'pay_fee_config' and
+        td1.table_columns = 'fee_type_cd'
+        left join t_dict td2 on t.fee_flag = td2.status_cd and td2.table_name = 'pay_fee_config' and td2.table_columns =
+        'fee_flag'
+        left join t_dict td3 on t.bill_type = td3.status_cd and td3.table_name = 'pay_fee_config' and td3.table_columns
+        = 'bill_type'
+        left join t_dict td4 on t.computing_formula = td4.status_cd and td4.table_name = 'pay_fee_config' and
+        td4.table_columns = 'computing_formula'
+        where 1 = 1
         <if test="feeTypeCd !=null and feeTypeCd != ''">
             and t.fee_type_cd= #{feeTypeCd}
+        </if>
+        <if test="secondaryFeeTypeCd !=null and secondaryFeeTypeCd != ''">
+            and t.secondary_fee_type_cd= #{secondaryFeeTypeCd}
         </if>
         <if test="computingFormula !=null and computingFormula != ''">
             and t.computing_formula= #{computingFormula}
@@ -259,22 +468,99 @@
             and t.fee_flag= #{feeFlag}
         </if>
         <if test="feeName !=null and feeName != ''">
-            and t.fee_name= #{feeName}
+            and t.fee_name like '%${feeName}%'
         </if>
-        <if test="startTime !=null and startTime != ''">
+        <if test="startTime !=null ">
             and t.start_time= #{startTime}
         </if>
-        <if test="endTime !=null and endTime != ''">
+        <if test="endTime !=null ">
             and t.end_time= #{endTime}
         </if>
+        <if test="valid !=null and valid == 1">
+            and t.end_time &gt; now()
+        </if>
         <if test="communityId !=null and communityId != ''">
-            and t.community_id= #{communityId}
+            and t.community_id in (#{communityId}, '9999')
+        </if>
+        <if test="communityIds !=null">
+            and t.community_id in
+            <foreach collection="communityIds" item="item" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
         </if>
         <if test="bId !=null and bId != ''">
             and t.b_id= #{bId}
         </if>
-
-
+        <if test="paymentCd !=null and paymentCd != ''">
+            and t.payment_cd= #{paymentCd}
+        </if>
+        <if test="paymentCycle !=null and paymentCycle != ''">
+            and t.payment_cycle= #{paymentCycle}
+        </if>
+        <if test="billType !=null and billType != ''">
+            and t.bill_type= #{billType}
+        </if>
+        <if test="deductFrom !=null and deductFrom != ''">
+            and t.deduct_from = #{deductFrom}
+        </if>
+        <if test="prepaymentPeriod !=null and prepaymentPeriod != ''">
+            and t.prepayment_period = #{prepaymentPeriod}
+        </if>
+        <if test="state !=null and state != ''">
+            and t.state = #{state}
+        </if>
     </select>
 
+    <!-- 淇濆瓨璐圭敤閰嶇疆淇℃伅 add by wuxw 2018-07-03 -->
+    <insert id="saveFeeConfig" parameterType="Map">
+        insert into pay_fee_config(fee_type_cd, computing_formula, additional_amount, status_cd, square_price,
+                                   is_default, config_id, fee_flag, fee_name,
+                                   start_time, end_time, community_id, b_id, bill_type, payment_cd, payment_cycle,
+                                   computing_formula_text, deduct_from, pay_online, scale, decimal_place, units,
+                                   prepayment_period,state)
+        values (#{feeTypeCd}, #{computingFormula}, #{additionalAmount}, '0', #{squarePrice}, #{isDefault}, #{configId},
+                #{feeFlag}, #{feeName}, #{startTime}, #{endTime}, #{communityId}, '-1', #{billType}, #{paymentCd},
+                #{paymentCycle}, #{computingFormulaText}, #{deductFrom}, #{payOnline}, #{scale}, #{decimalPlace},
+                #{units}, #{prepaymentPeriod},#{state})
+    </insert>
+
+    <select id="selectSssShow" parameterType="Map" resultType="Map">
+        select secondary_fee_type_cd secondaryFeeTypeCd,fee_type_cd feeTypeCd,secondary_fee_type_cd_name secondaryFeeTypeName,
+               secondary_fee_type_cd,fee_type_cd,secondary_fee_type_cd_name
+            from secondary_fee_type_cd_tb where 1 = 1
+
+        <if test="feeTypeCd !=null and feeTypeCd != ''">
+            and fee_type_cd = #{feeTypeCd}
+        </if>
+    </select>
+
+    <select id="selectSssBySecondaryFeeTypeCd" parameterType="Map" resultType="Map">
+        select secondary_fee_type_cd secondaryFeeTypeCd,
+               fee_type_cd feeTypeCd,
+               secondary_fee_type_cd_name secondartyFeeTypeCdName
+        from secondary_fee_type_cd_tb where 1 = 1
+        <if test="secondaryFeeTypeCd !=null and secondaryFeeTypeCd != ''">
+            and secondary_fee_type_cd = #{secondaryFeeTypeCd}
+        </if>
+    </select>
+
+
+    <select id="selectSss" parameterType="Map" resultType="Map">
+        SELECT
+            sft.secondary_fee_type_cd,sft.secondary_fee_type_cd AS secondaryFeeTypeCd,
+            sft.fee_type_cd,sft.fee_type_cd AS feeTypeCd,
+            sft.secondary_fee_type_cd_name,sft.secondary_fee_type_cd_name AS secondaryFeeTypeName
+        FROM
+            secondary_fee_type_cd_tb sft
+                JOIN
+            t_dict d1 ON sft.fee_type_cd = d1.status_cd
+                JOIN
+            t_dict d2 ON d1.name = d2.name
+        WHERE 1 = 1
+        <if test="feeTypeCd !=null and feeTypeCd != ''">
+            and d2.status_cd = #{feeTypeCd}
+            AND d1.status_cd != #{feeTypeCd};
+        </if>
+
+    </select>
 </mapper>

--
Gitblit v1.8.0