代码提交

liusheng

2023-12-04 926b0e68e108d0866d79c1a366e3d14d1cebac4b

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundController.java

@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.annotation.NotRepeatCommit;
import com.ruoyi.common.annotation.RepeatSubmit;
import com.ruoyi.common.config.RuoYiConfig;
import com.ruoyi.common.constant.HttpStatus;
@@ -481,6 +482,7 @@
     * 审核费用
     */
    @ApiOperation("审核费用")
    @RepeatSubmit
//    @Log(title = "审核费用", businessType = BusinessType.OTHER)
    @PostMapping("/checkfund")
    public AjaxResult checkFund(@RequestBody CheckFundVO checkFundVO) {
@@ -494,7 +496,6 @@
            serviceFundflowrule.setApplytype(serviceFund.getApplytype());
            serviceFundflowrule.setCheckuserno(loginUser.getUsername());
            log.info("serviceFundController---checkFund---queryList的入参值serviceFundflowrule:{}", serviceFundflowrule);

            List<ServiceFundflowrule> serviceFundflowrules = serviceFundflowruleService.queryList(serviceFundflowrule);

            if (serviceFundflowrules == null || serviceFundflowrules.stream().count() == 0) {
@@ -2099,6 +2100,7 @@
    /**
     * 费用类型计数
     */
//    @NotRepeatCommit(key = "param:arg[1]", value = 30000)
    @ApiOperation("费用类型计数")
    @GetMapping(value = "/countItem/{infoid}/{itemid}")
    public AjaxResult countItem(@PathVariable Long infoid, @PathVariable Long itemid) {
@@ -2123,10 +2125,10 @@
    /**
     * 合计个税
     */
    @NotRepeatCommit(key = "param:arg[1]", value = 30000)
    @ApiOperation("合计个税")
    @Log(title = "合计个税", businessType = BusinessType.INSERT)
    @PostMapping("/totaltax")
    @RepeatSubmit
    public AjaxResult totaltax(@RequestBody TotalTaxVO totalTaxVO) {
        Map<String, List<ServiceFunddetailExcel>> totaltax = serviceFundService.totaltax(totalTaxVO);
        if (ObjectUtils.isEmpty(totaltax)) {
@@ -2139,7 +2141,13 @@
            key2 = key;
        }
        ExcelUtil<ServiceFunddetailExcel> util = new ExcelUtil<ServiceFunddetailExcel>(ServiceFunddetailExcel.class);
        return AjaxResult.success(util.exportExcel(totaltax.get(key2), key2));
        AjaxResult ajaxResult = util.exportExcel(totaltax.get(key2), key2);
        String msg = (String) ajaxResult.get("msg");

        Map dataMap = new HashMap();
        dataMap.put("downloadUrl", "/profile/download/" + msg);

        return AjaxResult.success(dataMap);


    }