Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

java110

2021-10-13 5c8ea097a69d7a3b46d39a1b6908d999398c415d

 java110-db/src/main/resources/mapper/fee/TempCarFeeConfigServiceDaoImplMapper.xml

@@ -7,9 +7,9 @@
    <!-- 保存临时车收费标准信息 add by wuxw 2018-07-03 -->
    <insert id="saveBusinessTempCarFeeConfigInfo" parameterType="Map">
        insert into business_temp_car_fee_config(
        car_type,operate,config_id,fee_name,pa_id,area_num,start_time,end_time,b_id,rule_id,community_id
        car_type,operate,config_id,fee_name,pa_id,area_num,start_time,end_time,b_id,rule_id,community_id,fee_config_id
        ) values (
        #{carType},#{operate},#{configId},#{feeName},#{paId},#{areaNum},#{startTime},#{endTime},#{bId},#{ruleId},#{communityId}
        #{carType},#{operate},#{configId},#{feeName},#{paId},#{areaNum},#{startTime},#{endTime},#{bId},#{ruleId},#{communityId},#{feeConfigId}
        )
    </insert>

@@ -19,7 +19,7 @@
        select t.car_type,t.car_type carType,t.operate,t.config_id,t.config_id configId,t.fee_name,t.fee_name
        feeName,t.pa_id,t.pa_id paId,t.area_num,t.area_num areaNum,t.start_time,t.start_time
        startTime,t.end_time,t.end_time endTime,t.b_id,t.b_id bId,t.rule_id,t.rule_id
        ruleId,t.community_id,t.community_id communityId
        ruleId,t.community_id,t.community_id communityId,t.fee_config_id,t.fee_config_id feeConfigId
        from business_temp_car_fee_config t
        where 1 =1
        <if test="carType !=null and carType != ''">
@@ -62,9 +62,9 @@
    <!-- 保存临时车收费标准信息至 instance表中 add by wuxw 2018-07-03 -->
    <insert id="saveTempCarFeeConfigInfoInstance" parameterType="Map">
        insert into temp_car_fee_config(
        car_type,config_id,fee_name,pa_id,area_num,status_cd,start_time,end_time,b_id,rule_id,community_id
        car_type,config_id,fee_name,pa_id,area_num,status_cd,start_time,end_time,b_id,rule_id,community_id,fee_config_id
        ) select
        t.car_type,t.config_id,t.fee_name,t.pa_id,t.area_num,'0',t.start_time,t.end_time,t.b_id,t.rule_id,t.community_id
        t.car_type,t.config_id,t.fee_name,t.pa_id,t.area_num,'0',t.start_time,t.end_time,t.b_id,t.rule_id,t.community_id,t.fee_config_id
        from business_temp_car_fee_config t where 1=1
        <if test="carType !=null and carType != ''">
            and t.car_type= #{carType}
@@ -106,7 +106,7 @@
        select t.car_type,t.car_type carType,t.config_id,t.config_id configId,t.fee_name,t.fee_name
        feeName,t.pa_id,t.pa_id paId,t.area_num,t.area_num areaNum,t.status_cd,t.status_cd
        statusCd,t.start_time,t.start_time startTime,t.end_time,t.end_time endTime,t.b_id,t.b_id bId,t.rule_id,t.rule_id
        ruleId,t.community_id,t.community_id communityId,tcfr.rule_name ruleName,td.name carTypeName
        ruleId,t.community_id,t.community_id communityId,tcfr.rule_name ruleName,td.name carTypeName,t.fee_config_id,t.fee_config_id feeConfigId
        from temp_car_fee_config t
        left join temp_car_fee_rule tcfr on t.rule_id = tcfr.rule_id and tcfr.status_cd = '0'
        left join t_dict td on t.car_type = td.status_cd and td.table_name = 'temp_car_fee_config' and td.table_columns = 'car_type'
@@ -143,6 +143,9 @@
        </if>
        <if test="communityId !=null and communityId != ''">
            and t.community_id= #{communityId}
        </if>
        <if test="feeConfigId !=null and feeConfigId != ''">
            and t.fee_config_id= #{feeConfigId}
        </if>
        order by t.create_time desc
        <if test="page != -1 and page != null ">
@@ -230,6 +233,9 @@
        <if test="communityId !=null and communityId != ''">
            and t.community_id= #{communityId}
        </if>
        <if test="feeConfigId !=null and feeConfigId != ''">
            and t.fee_config_id= #{feeConfigId}
        </if>
    </select>
    <!-- 查询临时车 收费规则 -->
    <select id="queryTempCarFeeRules" parameterType="Map" resultType="Map">