修改了报销校验

yxh

2 天以前 8c215c8be0f5076e8c95daf1b2203440ca7dfcad

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

@@ -33,6 +33,7 @@
        <result property="deptmentname" column="DeptmentName"/>
        <result property="opochecker" column="OPOchecker"/>
        <result property="finvicepresident" column="FinVicePresident"/>
        <result property="financechecher" column="FinanceChecher"/>
        <result property="president" column="president"/>
        <result property="busvicepresident" column="BusVicePresident"/>
        <result property="officedirector" column="OfficeDirector"/>
@@ -65,12 +66,15 @@
        <result property="notes" column="notes"/>
        <result property="jxrq" column="jxrq"/>
        <result property="fundTaxId" column="fund_tax_id"/>
        <result property="taxcost" column="TaxCost"/>
        <result property="summaryId" column="summary_id"/>
    </resultMap>

    <sql id="selectServiceFundVo">
        select ID,
               InfoID,
               DonorNo,
               summary_id,
               DonorName,
               del_flag,
               create_by,
@@ -127,6 +131,7 @@
               upload_states,
               jxrq,
               notes,
               TaxCost,
               fund_tax_id
        from service_fund
    </sql>
@@ -137,6 +142,8 @@

        where del_flag = '0'
        <if test="donorno != null  and donorno != ''">and DonorNo = #{donorno}</if>
        <!-- 2026-10-22：报销单列表支持按"捐献者姓名"模糊筛选（仅在传值时生效，不影响其它调用方） -->
        <if test="donorname != null  and donorname != ''">and DonorName like concat('%', #{donorname}, '%')</if>
        <if test="fundTaxId != null ">and fund_tax_id = #{fundTaxId}</if>
        <if test="userno != null  and userno != ''">and UserNo = #{userno}</if>
        <if test="username != null  and username != ''">and UserName like concat('%', #{username}, '%')</if>
@@ -151,6 +158,7 @@
        <if test="infoid != null ">and InfoID = #{infoid}</if>
        <if test="donorno != null   and donorno != '' ">and DonorNo = #{donorno}</if>
        <if test="jxrq != null ">and jxrq = #{jxrq}</if>
        order by apply_time desc
    </select>

    <select id="getInfoByInfoId" resultType="com.ruoyi.project.domain.ServiceFund">
@@ -167,6 +175,7 @@
        SELECT
        `service_fund`.`ID` AS `id`,
        `service_fund`.`InfoID` AS `infoid`,
        `service_fund`.`summary_id` AS `summaryId`,
        `service_fund`.`DonorNo` AS `donorno`,
        `service_fund`.`DonorName` AS `donorname`,
        `service_fund`.`UserNo` AS `userno`,
@@ -268,6 +277,23 @@

    <select id="getExpertfeeList" statementType="CALLABLE"
            resultType="com.ruoyi.project.domain.vo.SpFinancialExpensesFundOut">
        call SP_SELECT_EXPERTFEE(#{PAAPPLYTYPE,mode=IN,jdbcType=INTEGER},#{DONORNAME,mode=IN,jdbcType=VARCHAR},#{PACHECKNO,mode=IN,jdbcType=VARCHAR},#{CHECKSTATUS,mode=IN,jdbcType=INTEGER},#{PADEPARTNO,mode=IN,jdbcType=VARCHAR},#{PAUSERNAME,mode=IN,jdbcType=VARCHAR})
        call SP_SELECT_EXPERTFEE(#{PAAPPLYTYPE,mode=IN,jdbcType=INTEGER},#{PFUNDTAXID,mode=IN,jdbcType=INTEGER},#{DONORNAME,mode=IN,jdbcType=VARCHAR},#{PADEPARTID,mode=IN,jdbcType=INTEGER},#{PAUSERNAME,mode=IN,jdbcType=VARCHAR})
    </select>
</mapper>

    <update id="updateFundTaxIdById">
        update service_fund
        <set>
            fund_tax_id = #{fundTaxId},
            fundtaxtime = null
        </set>
        where id = #{id}
    </update>
    <update id="updateFundIsTexById">
        update service_fund
        <set>
            istax = #{isTax},
            fundtaxtime = null
        </set>
        where id = #{id}
    </update>
</mapper>