代码提交

liusheng

2023-09-27 da3edb56ef670c58f6de09d28fde986d6be5a845

 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;
@@ -156,10 +156,16 @@
            list = list.stream().filter(obj -> obj.getDonorname().contains(spFinancialExpensesIn.getDonorname())).collect(Collectors.toList());
        }

        //通过金额过滤
        if (spFinancialExpensesIn.getMoney() != null) {
            list = list.stream().filter(reimbursementOut -> new BigDecimal(reimbursementOut.getPretaxcost()).compareTo(new BigDecimal(spFinancialExpensesIn.getMoney())) == 0).collect(Collectors.toList());

        }

        Collections.sort(list, new Comparator<SpFinancialExpensesFundOut>() {
            @Override
            public int compare(SpFinancialExpensesFundOut o1, SpFinancialExpensesFundOut o2) {
                return o2.getCreateTime().compareTo(o1.getCreateTime());
                return o1.getCreateTime().compareTo(o2.getCreateTime());
            }
        });
        return getCustomDataTable(list, pageNum, pageSize);
@@ -485,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;
@@ -517,7 +523,7 @@
            }

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

            ServiceFundflow serviceFundflow = new ServiceFundflow();
@@ -535,6 +541,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();
@@ -603,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);
                    }

@@ -694,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());
@@ -1075,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());
@@ -1083,21 +1096,45 @@
        dataMap.put("YWZ", serviceFund.getDeptmentname() == null ? "" : serviceFund.getDeptmentname());
        dataMap.put("ZHUZANG", serviceFund.getManagername() == null ? "" : serviceFund.getManagername());

        String bz = "";
        int i = 0;
        for (ServiceFunddetail f : fd) {
            seqno++;
            Map<String, Object> map = new HashMap<String, Object>();
            map.put("seqno", seqno);
//            String fyxm = "";
//            fyxm += f.getItemname() == null ? "" : f.getItemname();
//            fyxm += f.getAmount() + "元";
//            //如果是医疗成本，则把银行卡加上每条明细的后面
//            if (serviceFund.getApplytype().equals("3")) {
//                fyxm += "(";
//                fyxm += f.getUnitname() == null ? "" : f.getUnitname() + ";";
//                fyxm += f.getDepositbank() == null ? "" : f.getDepositbank() + ": ";
//                fyxm += f.getBankcardno() == null ? "" : f.getBankcardno();
//                fyxm += ")";
//            }

            //如果是医疗成本，则把银行卡加上每条明细的后面
            if (serviceFund.getApplytype().equals("3")) {
                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 += "<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 += "<w:br/>";
            }

            String fyxm = "";
            fyxm += f.getItemname() == null ? "" : f.getItemname();
            fyxm += f.getAmount() + "元";
            //如果是医疗成本，则把银行卡加上每条明细的后面
            if (serviceFund.getApplytype().equals("3")) {
                fyxm += "(";
                fyxm += f.getUnitname() == null ? "" : f.getUnitname() + ";";
                fyxm += f.getDepositbank() == null ? "" : f.getDepositbank() + ": ";
                fyxm += f.getBankcardno() == null ? "" : f.getBankcardno();
                fyxm += ")";
            }
            map.put("FYXM", fyxm);
            newList.add(map);
        }
@@ -1111,7 +1148,7 @@
//        dataMap.put("JEDS", convert(serviceFund.getAmountrequested()) + "整");
        //备注里放的是经办人的银行卡信息

        dataMap.put("BXBZ", serviceFund.getApplytype().equals("3") ? "" : infoByUserNo == null ? "" : infoByUserNo.getBranchbankname() + "  " + infoByUserNo.getBankcardno());
        dataMap.put("BXBZ", serviceFund.getApplytype().equals("3") || serviceFund.getApplytype().equals("4") ? bz : infoByUserNo == null ? "" : infoByUserNo.getBranchbankname() + "  " + infoByUserNo.getBankcardno());
        dataMap.put("YZ", serviceFund.getPresident() == null ? "" : serviceFund.getPresident());
        dataMap.put("CWFYZ", serviceFund.getFinvicepresident() == null ? "" : serviceFund.getFinvicepresident());
        dataMap.put("YWFYZ", serviceFund.getBusvicepresident() == null ? "" : serviceFund.getBusvicepresident());
@@ -1134,7 +1171,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());

@@ -1873,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());
@@ -1930,7 +1968,6 @@

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


    }


@@ -1966,4 +2003,17 @@

    }


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

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

}