代码提交

liusheng

2025-01-02 b6dd47b05107fc36d8ff4f7f29a4446521f95503

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

@@ -78,7 +78,7 @@
    private IServiceReimbursementService serviceReimbursementService;

    @Autowired
    private IServiceSystemmessageService ServiceSystemmessage;
    private IServiceSystemmessageService iServiceSystemmessageService;

    @Autowired
    private IServiceExternalpersonService externalpersonService;
@@ -406,8 +406,8 @@
            Boolean aBoolean = serviceFundflowService.saveData(serviceFundflow);
            log.info("sserviceFund保存的的值是-------- :{}", aBoolean);

            //001审批通过之后，就需要把“办公室主任”的名字填上
            if (checkFundVO.getFlowconclusion() == 1 && user.getUserName().equals("001")) {
            //053审批通过之后，就需要把“办公室主任”的名字填上
            if (checkFundVO.getFlowconclusion() == 1 && user.getUserName().equals("053")) {
                serviceFund.setOfficedirector(user.getNickName());
                serviceFund.setUploadStates(1);
            }
@@ -470,7 +470,7 @@
                    serviceSystemmessage.setMessagecontent("您" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(serviceFund.getCreateTime()) + "提交的绩效申请已驳回，原因: " + checkFundVO.getFlowcontent() + "");
                }
            }
            ServiceSystemmessage.save(serviceSystemmessage);
            iServiceSystemmessageService.save(serviceSystemmessage);
            return AjaxResult.success();
        } else {
            return AjaxResult.error(HttpStatus.NO_CONTENT, "费用编号不正确");
@@ -643,7 +643,11 @@
        dataMap.put("JXZXM", serviceFund.getDonorname() == null ? "" : serviceFund.getDonorname());
        dataMap.put("JSR", serviceFund.getUsername() == null ? "" : serviceFund.getUsername());
//        dataMap.put("FYXM1", "支付专家费用，其中税前金额" + serviceFund.getPretaxcost() + "元，税后金额" + serviceFund.getTaxedcost() + "元。");
        dataMap.put("FYXM1", "人体器官捐献专家劳务费:" + serviceFund.getPretaxcost() + "元 (其中税后费用由中心承担税费)。");
        if (serviceFund.getApplytype().equals("1")) {
            dataMap.put("FYXM1", "人体器官捐献专家劳务费:" + serviceFund.getPretaxcost() + "元 (其中税后费用由中心承担税费)。");
        } else if (serviceFund.getApplytype().equals("4")) {
            dataMap.put("FYXM1", "办公费用:" + serviceFund.getPretaxcost());
        }
        dataMap.put("FYXM2", "");
        dataMap.put("FYXM3", "");
        dataMap.put("JEXS", serviceFund.getPretaxcost());
@@ -991,14 +995,14 @@
            out = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(outFile), "utf-8"));

        } catch (FileNotFoundException e1) {
            log.error("FileNotFoundException报错信息是：{}",e1.getMessage());
            log.error("FileNotFoundException报错信息是：{}", e1.getMessage());
//            e1.printStackTrace();
        }
        try {

            t.process(dataMap, out);
        } catch (TemplateException e) {
            log.error("TemplateException报错信自是：{}",e.getMessage());
            log.error("TemplateException报错信自是：{}", e.getMessage());
            e.getMessage();
        }
        Map<String, Object> map = new HashMap<>();