liusheng
2023-05-18 71060a7cb45508e86e9a1eff6be93f88f929adfc
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementController.java
@@ -152,6 +152,12 @@
        }
        //startPage();
        List<SpFinancialExpensesReimbursementOut> list = serviceReimbursementService.getListBypower(loginUser.getUsername(), 1, APPLICANT, APPLICATIONBEGTIME, APPLICATIONENDTIME, loginUser.getDeptId().toString(), CHECKFLAG, APPLYTYPE);
        Collections.sort(list, new Comparator<SpFinancialExpensesReimbursementOut>() {
            @Override
            public int compare(SpFinancialExpensesReimbursementOut o1, SpFinancialExpensesReimbursementOut o2) {
                return o2.getCreateTime().compareTo(o1.getCreateTime());
            }
        });
        return getCustomDataTable(list, pageNum, pageSize);
    }
@@ -595,7 +601,7 @@
                serviceSystemmessage.setMessagecontent("您" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(serviceReimbursement.getCreateTime()) + "提交的关于捐献案例【" + serviceReimbursement.getDonorname() + "】的差旅费申请已通过" + (OriginalFlowLevel + 1) + "级审核");
                if (totalLevel == OriginalFlowLevel + 1) {
                    //所有数据新增到备份表
                    this.addSharedData(checkFundVO.getFundid());
                    serviceReimbursementService.addSharedData(checkFundVO.getFundid());
                }
            } else {
                //驳回