代码提交

liusheng

2023-11-10 19b8481dd1b30368f97a2a983f61ff93a340a98c

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

@@ -1,6 +1,7 @@
package com.ruoyi.web.controller.project;

import com.alibaba.fastjson.JSONObject;
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.RepeatSubmit;
@@ -13,6 +14,7 @@
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.exception.base.BaseException;
import com.ruoyi.common.tax.TaxtUtils;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
@@ -531,6 +533,18 @@
                    serviceFund.setFlowlevel(100L);
                    serviceFund.setRecordstatus(99);
                    serviceFundService.updateById(serviceFund);

                    //保存审批流程表
                    ServiceFundflow serviceFundflow = new ServiceFundflow();
                    SysUser user = loginUser.getUser();
                    serviceFundflow.setFundid(serviceFund.getId());
                    serviceFundflow.setCheckuserno(user.getUserName());
                    serviceFundflow.setCheckusername(user.getNickName());
                    serviceFundflow.setFundtype(2);
                    serviceFundflow.setApplytype(serviceFund.getApplytype());
                    serviceFundflow.setFlowconclusion(CheckFlag);
                    serviceFundflow.setFlowcontent("通过");
                    Boolean aBoolean = serviceFundflowService.saveData(serviceFundflow);
                    return AjaxResult.success();
                }
                //记录一下，下一级的审批，以便于下一级退回后，发起者提交时，能再提到当前审批层级
@@ -692,6 +706,7 @@

        return toAjax(false);
    }


    /**
     * 删除费用申请主
@@ -2105,4 +2120,28 @@
        return AjaxResult.success(serviceFundService.performance(serviceFundVO));
    }

    /**
     * 合计个税
     */
    @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)) {
            throw new BaseException("合计个税失败");
        }

        Set<String> strings = totaltax.keySet();
        String key2 = null;
        for (String key : strings) {
            key2 = key;
        }
        ExcelUtil<ServiceFunddetailExcel> util = new ExcelUtil<ServiceFunddetailExcel>(ServiceFunddetailExcel.class);
        return AjaxResult.success(util.exportExcel(totaltax.get(key2), key2));


    }

}