修改流程代码提交

liusheng

2024-02-22 d5c2c0762ccbb2bb33635f99480d404f1fb10d5a

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

@@ -241,7 +241,7 @@
    @ApiOperation("新增费用申请主")
    //@PreAuthorize("@ss.hasPermi('project:fund:add')")
    @Log(title = "费用申请主", businessType = BusinessType.INSERT)
    @PostMapping
    @PostMapping("/add")
    @RepeatSubmit
    @Options(useGeneratedKeys = true, keyProperty = "id")
    public AjaxResult add(@RequestBody ServiceFund serviceFund) {
@@ -530,7 +530,8 @@
                if (serviceFund.getFlowlevel() == 1 && serviceFund.getBackflowlevel() == 100) {
                    log.info("财务退回再提交，出纳再次审批，之后提交到财务");
                    //说明是财务退回再提交的.需要出纳再看一遍，没问题之后，往分享表里新增
                    serviceFundService.addFundSharedInfo(serviceFund.getId());
//                    serviceFundService.addFundSharedInfo(serviceFund.getId());
                    serviceFund.setFlowlevel(3L);
                    serviceFund.setFlowlevel(100L);
                    serviceFund.setRecordstatus(99);
                    serviceFundService.updateById(serviceFund);
@@ -616,9 +617,9 @@
                //通过
                serviceSystemmessage.setMessagetitle("" + (OriginalFlowLevel + 1) + "级审核通过");
                serviceSystemmessage.setMessagecontent("您" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(serviceFund.getCreateTime()) + "提交的关于捐献案例【" + serviceFund.getDonorname() + "】的费用申请已通过" + (OriginalFlowLevel + 1) + "级审核");
                if (TotalLevel == OriginalFlowLevel + 1) {
                    serviceFundService.addFundSharedInfo(checkFundVO.getFundid());
                }
//                if (TotalLevel == OriginalFlowLevel + 1) {
//                    serviceFundService.addFundSharedInfo(checkFundVO.getFundid());
//                }

            } else {
                //驳回
@@ -1189,8 +1190,12 @@
        dataMap.put("YWZ", serviceFund.getDeptmentname() == null ? "" : serviceFund.getDeptmentname());
        dataMap.put("ZHUZANG", serviceFund.getManagername() == null ? "" : serviceFund.getManagername());

        dataMap.put("FYMC", LocalDate.now().getYear() + "年" + LocalDate.now().getMonthValue() + "月人体器官获取服务管理中心工作人员绩效");

        if (StringUtils.isEmpty(serviceFund.getRemark())) {
            dataMap.put("FYMC", LocalDate.now().getYear() + "年" + LocalDate.now().getMonthValue() + "月人体器官获取服务管理中心工作人员绩效");
        } else {
            dataMap.put("FYMC", serviceFund.getRemark().substring(0, serviceFund.getRemark().length() - 2) + "人体器官获取服务管理中心工作人员绩效");
        }
        String bz = "";
        int i = 0;
        if (!serviceFund.getApplytype().equals("5")) {
@@ -1231,7 +1236,11 @@
            Map<String, Object> map = new HashMap<String, Object>();
            map.put("seqno", 1);
            String fyxm = "";
            fyxm += LocalDate.now().getYear() + "年" + LocalDate.now().getMonthValue() + "月人体器官获取服务管理中心工作人员绩效,共计";
            if (StringUtils.isEmpty(serviceFund.getRemark())) {
                fyxm += LocalDate.now().getYear() + "年" + LocalDate.now().getMonthValue() + "月人体器官获取服务管理中心工作人员绩效,共计";
            } else {
                fyxm += serviceFund.getRemark().substring(0, serviceFund.getRemark().length() - 2) + "人体器官获取服务管理中心工作人员绩效,共计";
            }
            fyxm += serviceFund.getPretaxcost() + "元";
            if (serviceFund.getPretaxcost() == null && serviceFund.getPretaxcost() == 0.0) {
                fyxm = "";