代码提交

liusheng

2023-10-19 f80df09d8dee5c731cb42d4e3d18f627e32bdaea

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

@@ -76,7 +76,7 @@
    private IServiceSystemmessageService ServiceSystemmessage;

    @Autowired
    private IServiceFundSharedService fundServiceShare;
    private IBaseOnlyvalueService baseOnlyvalueService;

    @Autowired
    private IServiceExternalpersonService externalpersonService;
@@ -128,6 +128,7 @@
        Integer APPLYTYPE = spFinancialExpensesIn.getAPPLYTYPE();
        Integer pageNum = spFinancialExpensesIn.getPageNum();
        Integer pageSize = spFinancialExpensesIn.getPageSize();
        Integer checkstatus = spFinancialExpensesIn.getCheckstatus();

        if (pageNum == null) {
            pageNum = 1;
@@ -150,7 +151,7 @@
        }

        //startPage();
        List<SpFinancialExpensesFundOut> list = serviceFundService.getListBypower(loginUser.getUsername(), 2, APPLICANT, APPLICATIONBEGTIME, APPLICATIONENDTIME, loginUser.getDeptId().toString(), CHECKFLAG, APPLYTYPE);
        List<SpFinancialExpensesFundOut> list = serviceFundService.getListBypower(loginUser.getUsername(), 2, APPLICANT, APPLICATIONBEGTIME, APPLICATIONENDTIME, loginUser.getDeptId().toString(), CHECKFLAG, APPLYTYPE,checkstatus);
        //通过捐献者过滤
        if (StringUtils.isNotEmpty(spFinancialExpensesIn.getDonorname())) {
            list = list.stream().filter(obj -> obj.getDonorname().contains(spFinancialExpensesIn.getDonorname())).collect(Collectors.toList());
@@ -491,7 +492,7 @@

            Integer CheckFlag = 0;
            Integer RecordStatus = serviceFund.getRecordstatus();
            Integer FlowLevel = serviceFund.getFlowlevel();
            Integer FlowLevel = serviceFund.getFlowlevel().intValue();
            Integer OriginalFlowLevel = FlowLevel;
            if (checkFundVO.getFlowconclusion() == 1) {
                CheckFlag = 1;
@@ -523,7 +524,7 @@
            }

            serviceFund.setRecordstatus(RecordStatus);
            serviceFund.setFlowlevel(FlowLevel);
            serviceFund.setFlowlevel(FlowLevel.longValue());
            //  serviceFund.setBackflowlevel(serviceFund.getFlowlevel());

            ServiceFundflow serviceFundflow = new ServiceFundflow();
@@ -541,6 +542,11 @@
            }
            serviceFundflow.setFlowlevel(OriginalFlowLevel + 1);
            serviceFundflowService.save(serviceFundflow);

            //001审批通过之后，就需要把“办公室主任”的名字填上
            if (checkFundVO.getFlowconclusion() == 1 && user.getUserName().equals("001")) {
                serviceFund.setOfficedirector(user.getNickName());
            }
            serviceFundService.updateById(serviceFund);

            ServiceSystemmessage serviceSystemmessage = new ServiceSystemmessage();
@@ -609,17 +615,17 @@
                if (!postids.contains(2)) {
                    serviceFund.setRecordstatus(2);
                    if (serviceFund.getBackflowlevel() != null) {
                        serviceFund.setFlowlevel(serviceFund.getBackflowlevel());
                        serviceFund.setFlowlevel(serviceFund.getBackflowlevel().longValue());
                    } else {
                        serviceFund.setBackflowlevel(1);
                        serviceFund.setFlowlevel(1);
                        serviceFund.setFlowlevel(1L);
                    }
                } else {
                    serviceFund.setRecordstatus(0);
                    if (serviceFund.getBackflowlevel() != null) {
                        serviceFund.setFlowlevel(serviceFund.getBackflowlevel());
                        serviceFund.setFlowlevel(serviceFund.getBackflowlevel().longValue());
                    } else {
                        serviceFund.setFlowlevel(0);
                        serviceFund.setFlowlevel(0L);
                        serviceFund.setBackflowlevel(0);
                    }

@@ -700,6 +706,7 @@
        String time = date.substring(0, 10);

        dataMap.put("XZBH", serviceFund.getBh() == null ? "" : serviceFund.getBh());
        dataMap.put("ZB", serviceFund.getDeptmentname() == null ? "" : serviceFund.getDeptmentname());
        dataMap.put("TBYYMMDD", time);
        dataMap.put("BXDFJ", serviceFund.getAttachcount() == 0 ? "   " : serviceFund.getAttachcount());
        dataMap.put("JXZXM", serviceFund.getDonorname() == null ? "" : serviceFund.getDonorname());
@@ -1022,11 +1029,13 @@
        Template t = null;
        try {
            //捐献表.ftl为要装载的模板
            //专家劳务费申请 1    伦理评估劳务费申请 2    医学成本费用申请 3     办公费用报销申请 4
            //专家劳务费申请 1    伦理评估劳务费申请 2    医学成本费用申请 3     办公费用报销申请 4   绩效费用报销申请 5
            if (dataYX.equals("3")) {
                t = configuration.getTemplate("医学成本费用申请单.ftl");
            } else if (dataYX.equals("4")) {
                t = configuration.getTemplate("办公费用申请单.ftl");
            }else if (dataYX.equals("5")) {
                t = configuration.getTemplate("绩效费用申请单.ftl");
            }
        } catch (IOException e) {
            e.printStackTrace();
@@ -1081,6 +1090,7 @@
        List<Map<String, Object>> newList = new ArrayList<Map<String, Object>>();
        int seqno = 0;

        dataMap.put("ZB", serviceFund.getDeptmentname() == null ? "" : serviceFund.getDeptmentname());
        dataMap.put("XZBH", serviceFund.getBh() == null ? "" : serviceFund.getBh());
        dataMap.put("TBYYMMDD", time);
        dataMap.put("BXDFJ", serviceFund.getAttachcount() == 0 ? "   " : serviceFund.getAttachcount());
@@ -1110,18 +1120,18 @@
            //如果是医疗成本，则把银行卡加上每条明细的后面
            if (serviceFund.getApplytype().equals("3")) {
                i = i + 1;
                bz += f.getUnitname() == null ? "(" + i + ")" : "(" + i + ")" + f.getUnitname() + "，";
                bz += f.getBeneficiaryname() == null ? "(" + i + ")" : "(" + i + ")" + f.getBeneficiaryname() + "，";
                bz += "金额 : " + f.getAmount() + "元" + "，";
                bz += f.getDepositbank() == null ? "" : f.getDepositbank() + ": ";
                bz += f.getBankcardno() == null ? "" : f.getBankcardno() + "，";
                bz += "金额 : " + f.getAmount() + "元";
                bz += f.getBankcardno() == null ? "" : f.getBankcardno();
                bz += "<w:br/>";
            }
            if (serviceFund.getApplytype().equals("4")) {
                i = i + 1;
                bz += f.getBeneficiaryname() == null ? "(" + i + ")" : "(" + i + ")" + f.getBeneficiaryname() + "，";
                bz += "金额 : " + f.getAmount() + "元" + "，";
                bz += f.getDepositbank() == null ? "" : f.getDepositbank() + ": ";
                bz += f.getBankcardno() == null ? "" : f.getBankcardno() + "，";
                bz += "金额 : " + f.getAmount() + "元";
                bz += f.getBankcardno() == null ? "" : f.getBankcardno();
                bz += "<w:br/>";
            }

@@ -1164,7 +1174,7 @@
            count++;
            map.put("XH", count);
            map.put("FWNR", f.getItemname() == null ? "" : f.getItemname());
            map.put("DW", f.getUnitname() == null ? "" : f.getUnitname());
            map.put("DW", f.getBeneficiaryname() == null ? "" : f.getBeneficiaryname());
            map.put("SL", f.getQuantity() == 0.00 ? "" : f.getQuantity());
            map.put("JG", f.getPrice() == 0.00 ? "" : f.getPrice());

@@ -1903,6 +1913,7 @@
        String date = formatter.format(dt);
        String time = date.substring(0, 10);

        dataMap.put("ZB", serviceFund.getDeptmentname() == null ? "" : serviceFund.getDeptmentname());
        dataMap.put("XZBH", serviceFund.getBh() == null ? "" : serviceFund.getBh());
        dataMap.put("TBYYMMDD", time);
        dataMap.put("BXDFJ", serviceFund.getAttachcount() == 0 ? "   " : serviceFund.getAttachcount());
@@ -1960,7 +1971,6 @@

        dataMap.put("SQZE", String.format("%.2f", sh).toString() + "");


    }


@@ -1996,4 +2006,17 @@

    }


    /**
     * 绩效计算
     */
    @ApiOperation("绩效计算")
    @Log(title = "绩效计算", businessType = BusinessType.INSERT)
    @PostMapping("/performance")
    @RepeatSubmit
    public AjaxResult performance(@RequestBody ServiceFundVO serviceFundVO) {

        return AjaxResult.success(serviceFundService.performance(serviceFundVO));
    }

}