日志修改

liusheng

2025-09-18 0293e06edd011d6921ec2cc08392042f5765dfb8

 ruoyi-project/src/main/resources/mapper/project/ServiceFunddetailMapper.xml

@@ -62,13 +62,21 @@
        <result property="taxTime" column="tax_time"/>
        <result property="jxrq" column="jxrq"/>
        <result property="invoicefiles" column="InvoiceFiles"/>
        <result property="deptId" column="dept_id"/>
        <result property="deptName" column="dept_name"/>
        <result property="xh" column="xh"/>
        <result property="allAmount" column="all_amount"/>
    </resultMap>

    <sql id="selectServiceFunddetailVo">
        select ID,
               fundID,
               xh,
               all_amount,
               InfoId,
               DonorNo,
               dept_id,
               dept_name,
               DonorName,
               BeneficiaryName,
               BeneficiaryNo,
@@ -142,6 +150,9 @@
            <if test="uploadflag != null  and uploadflag != ''">and uploadflag = #{uploadflag}</if>
            <if test="uploadtime != null ">and uploadtime = #{uploadtime}</if>
            <if test="fundid != null and fundid != '' ">and fundID = #{fundid}</if>
            <if test="deptId != null  ">and dept_id = #{deptId}</if>
            <if test="deptName != null and deptName != '' ">and dept_name = #{deptName}</if>
            <if test="allAmount != null ">and all_amount = #{allAmount}</if>

        </where>
    </select>
@@ -235,6 +246,9 @@
        a.SERVICETYPE,
        a.SERVICETYPENAME,
        a.subjecttype,
        a.dept_id,
        a.dept_name,
        a.all_amount,
        a.subjecttypename
        from service_funddetail a,
        service_fund b
@@ -254,27 +268,41 @@
    </select>

    <update id="updateTaxTime" parameterType="com.ruoyi.project.domain.ServiceFunddetail">
        update com.ruoyi.project.domain.
        update service_funddetail
        <set>
            tax_time = #{taxTime},
            xh = #{xh}
        </set>
        where fundID = #{fundid}
    </update>

    <select id="getTaxSum" parameterType="com.ruoyi.project.domain.vo.TaxMoneyByItemEO"
            resultType="com.ruoyi.project.domain.vo.TaxMoneySumEO">
        SELECT sum(a.Amount) amounts, sum(a.TaxAmount) taxAmounts, sum(a.TaxedAmount) taxedAmounts
        FROM service_funddetail a,service_fund b
        SELECT sum(a.Amount) amounts, sum(a.TaxAmount) taxAmounts, sum(a.TaxedAmount) taxedAmounts, max(a.xh) as xh,a.IDCardNo
        FROM service_funddetail a,
             service_fund b
        where a.FundID = b.id
          and a.tax_time &lt; #{taxTime}
          and a.tax_time &lt;= #{taxTime}
          and b.istax = 1
          and a.tax_time >= #{firstDay}
          and a.IDCardNo = #{IDCard}
          and a.del_flag != 1
          and b.id != #{fundID}
          and b.fundtaxtime &lt; #{taxTime}
          and b.fundtaxtime
            &lt;= #{taxTime}
          and b.fundtaxtime >= #{firstDay}
          and b.del_flag != 1
          and b.ApplyType in (1, 2)
          and b.ApplyType in (1
            , 2)
group by a.IDCardNo
    </select>

    <select id="getMaxXH" parameterType="com.ruoyi.project.domain.vo.TaxMoneyByItemEO"
            resultType="Long">
        SELECT max(xh)
        FROM service_funddetail
        where tax_time &lt;= #{taxTime}
          and tax_time >= #{firstDay}
          and TRIM(IDCardNo) = #{IDCard}
          and del_flag != 1
    </select>

    <select id="totlaTax" resultType="com.ruoyi.project.domain.ServiceFunddetail">
@@ -287,4 +315,9 @@
        and del_flag=0
    </select>

</mapper>
    <!--    <select id="getListBySpStatBonus" statementType="CALLABLE"-->
    <!--            resultType="com.ruoyi.project.domain.SpStatBonus">-->
    <!--        call `SP_STAT_BONUS`(#{PABEGTIME,mode=IN,jdbcType=VARCHAR},#{PAENDTIME,mode=IN,jdbcType=VARCHAR},#{PADEPTNO,mode=IN,jdbcType=VARCHAR},#{PAUSERNO,mode=IN,jdbcType=VARCHAR},#{PABONUSTYPE,mode=IN,jdbcType=VARCHAR})-->
    <!--    </select>-->

</mapper>