代码提交

liusheng

2024-05-13 a66c1525b1a959eed00da4c7151e097900fb0ca2

代码提交

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java

@@ -232,8 +232,8 @@
    }

    @ApiOperation("清理错误次数")
    @GetMapping("/cleanErrorNums")
    public AjaxResult cleanErrorNums(@RequestParam("userName") String userName) {
    @GetMapping("/cleanErrorNums/{userName}")
    public AjaxResult cleanErrorNums(@PathVariable String userName) {
        return AjaxResult.success(userService.cleanErrorNums(userName));
    }


 ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/SpSelectExpertfee.java

@@ -2,9 +2,11 @@


import com.ruoyi.common.core.page.PageDomain;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

@ApiModel("SpSelectExpertfee存储过程")
@Data
public class SpSelectExpertfee extends PageDomain {

@@ -22,22 +24,16 @@


    /**
     * 审核人，047是陈慕华
     * 算税ID
     */
    @ApiModelProperty("审核人，047是陈慕华")
    private String pacheckno = "";
    @ApiModelProperty("算税ID")
    private Integer pfundtaxid = null;

    /**
     * 审核状态：0是未审核
     * 部门id
     */
    @ApiModelProperty("审核状态：0是未审核")
    private Integer checkstatus = null;

    /**
     * 部门编号
     */
    @ApiModelProperty("部门编号")
    private String padepartno = "";
    @ApiModelProperty("部门id")
    private Integer padepartid = null;

    /**
     * 经办人，支持模糊搜索

 ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceFundMapper.java

@@ -36,8 +36,8 @@

    List<SpFinancialExpensesFundOut> getListBypower(@Param("PAUSERNO") String PAUSERNO, @Param("PAFUNDTYPE") Integer PAFUNDTYPE, @Param("PAAPPLICANT") String PAAPPLICANT, @Param("PAAPPLICATIONBEGTIME") String PAAPPLICATIONBEGTIME, @Param("PAAPPLICATIONENDTIME") String PAAPPLICATIONENDTIME, @Param("PADEPARTMENT") String PADEPARTMENT, @Param("CHECKFLAG") Integer CHECKFLAG, @Param("APPLYTYPE") Integer APPLYTYPE, @Param("CHECKSTATUS") Integer CHECKSTATUS, @Param("donorname") String donorname);

    List<SpFinancialExpensesFundOut> getExpertfeeList(@Param("PAAPPLYTYPE") Integer PAAPPLYTYPE, @Param("DONORNAME") String DONORNAME, @Param("PACHECKNO") String PACHECKNO, @Param("CHECKSTATUS") Integer CHECKSTATUS, @Param("PADEPARTNO") String PADEPARTNO, @Param("PAUSERNAME") String PAUSERNAME);
    List<SpFinancialExpensesFundOut> getExpertfeeList(@Param("PAAPPLYTYPE") Integer PAAPPLYTYPE, @Param("PFUNDTAXID") Integer PFUNDTAXID, @Param("DONORNAME") String DONORNAME, @Param("PADEPARTID") Integer PADEPARTID, @Param("PAUSERNAME") String PAUSERNAME);

    Boolean updateFundTaxIdById(@Param("id") Long id,@Param("fundTaxId") Long fundTaxId);
    Boolean updateFundTaxIdById(@Param("id") Long id, @Param("fundTaxId") Long fundTaxId);

}

 ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundServiceImpl.java

@@ -708,7 +708,8 @@

    @Override
    public List<SpFinancialExpensesFundOut> getExpertfeeList(SpSelectExpertfee spSelectExpertfee) {
        return serviceFundMapper.getExpertfeeList(spSelectExpertfee.getPaApplyType(), spSelectExpertfee.getDonorname(), spSelectExpertfee.getPacheckno(), spSelectExpertfee.getCheckstatus(), spSelectExpertfee.getPadepartno(), spSelectExpertfee.getPausername());
        log.info("spSelectExpertfee的入参为：{}",spSelectExpertfee);
        return serviceFundMapper.getExpertfeeList(spSelectExpertfee.getPaApplyType(), spSelectExpertfee.getPfundtaxid(), spSelectExpertfee.getDonorname(), spSelectExpertfee.getPadepartid(), spSelectExpertfee.getPausername());
    }

    @Override
@@ -934,7 +935,7 @@
        String filePath = RuoYiConfig.getDownloadPath() + ajaxResult.get("msg");

        List<VExpertfeeDonor> list2 = vExpertfeeDonorMapper.selectVExpertfeeDonorList2(faxId);
        ExcelUtil<VExpertfeeDonor> util2= new ExcelUtil<VExpertfeeDonor>(VExpertfeeDonor.class);
        ExcelUtil<VExpertfeeDonor> util2 = new ExcelUtil<VExpertfeeDonor>(VExpertfeeDonor.class);
        AjaxResult ajaxResult2 = util2.exportExcel(list2, "VExpertfeeDonor");

        List<VExpertfeeExpert> list3 = vExpertfeeExpertMapper.selectVExpertfeeExpertListByFaxId(faxId);

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

@@ -271,7 +271,7 @@

    <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>

    <update id="updateFundTaxIdById">
@@ -281,4 +281,4 @@
        </set>
        where id = #{id}
    </update>
</mapper>
</mapper>