代码提交

liusheng

2024-03-11 48d56c0780ddcd28a19f306064e1dd21f0c425c0

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

@@ -59,7 +59,11 @@
        <result property="performancetype" column="performancetype"/>
        <result property="istax" column="istax"/>
        <result property="fundtaxtime" column="fundtaxtime"/>

        <result property="applyTime" column="apply_time"/>
        <result property="applyTime" column="apply_time"/>
        <result property="uploadStates" column="upload_states"/>
        <result property="notes" column="notes"/>
        <result property="jxrq" column="jxrq"/>
    </resultMap>

    <sql id="selectServiceFundVo">
@@ -117,7 +121,11 @@
               checkstatus,
               performancetype,
               istax,
               fundtaxtime
               apply_time,
               fundtaxtime,
               upload_states,
               jxrq,
               notes
        from service_fund
    </sql>

@@ -139,6 +147,7 @@
        <if test="createBy != null  and createBy != '' ">and create_by = #{createBy}</if>
        <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>
    </select>

    <select id="getInfoByInfoId" resultType="com.ruoyi.project.domain.ServiceFund">
@@ -197,6 +206,7 @@
        `service_fund`.`uploadtime` AS `uploadtime`,
        `service_fund`.`PretaxCost` AS `pretaxcost`,
        `service_fund`.`TaxedCost` AS `taxedcost`,
        `service_fund`.`jxrq` AS `jxrq`,
        `service_funddetail`.`ID` AS `fdid`,
        `service_funddetail`.`fundID` AS `fundid`,
        `service_funddetail`.`BeneficiaryName` AS `beneficiaryname`,