代码提交

liusheng

2023-09-20 e91d1f0251d30dc3c59b38d5318266357a64c12c

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

@@ -491,7 +491,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 +523,7 @@
            }

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

            ServiceFundflow serviceFundflow = new ServiceFundflow();
@@ -543,7 +543,7 @@
            serviceFundflowService.save(serviceFundflow);

            //001审批通过之后，就需要把“办公室主任”的名字填上
            if (checkFundVO.getFlowconclusion() == 1 && user.getUserId().equals("001")) {
            if (checkFundVO.getFlowconclusion() == 1 && user.getUserName().equals("001")) {
                serviceFund.setOfficedirector(user.getNickName());
            }
            serviceFundService.updateById(serviceFund);
@@ -614,17 +614,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);
                    }

@@ -705,6 +705,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());
@@ -1086,6 +1087,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());
@@ -1115,18 +1117,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/>";
            }

@@ -1908,6 +1910,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());
@@ -1964,7 +1967,6 @@
        dataMap.put("SHHJ", String.format("%.2f", sh).toString() + "");

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


    }