Merge branch 'master' of https://github.com/java110/MicroCommunity

java110

2020-08-23 08d8b029b10706b135713424e9b2a1b6e3839372

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

@@ -179,6 +179,13 @@
        <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>
@@ -304,6 +311,9 @@
        <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}
        </if>
@@ -323,4 +333,18 @@

    </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
        ) values (
        #{feeTypeCd},#{computingFormula},#{additionalAmount},'0',#{squarePrice},#{isDefault},#{configId},
        #{feeFlag},#{feeName},#{startTime},#{endTime},#{communityId},'-1',#{billType},#{paymentCd},#{paymentCycle}
        )
    </insert>

</mapper>