日志修改

liusheng

7 小时以前 34a716e48e49743083953113bfc2e8011d52444f

 ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceReimbursementServiceImpl.java

@@ -380,6 +380,7 @@
                    serviceFundflow.setCheckuserno(user.getUserName());
                    serviceFundflow.setCheckusername(user.getNickName());
                    serviceFundflow.setFundtype(1);
                    serviceFundflow.setCheckTime(new Date());
                    serviceFundflow.setApplytype("0");
                    serviceFundflow.setFlowconclusion(CheckFlag);
                    serviceFundflow.setFlowcontent("通过");
@@ -436,6 +437,7 @@
            serviceFundflow.setFundid(serviceReimbursement.getId());
            serviceFundflow.setCheckuserno(user.getUserName());
            serviceFundflow.setCheckusername(user.getNickName());
            serviceFundflow.setCheckTime(new Date());
            serviceFundflow.setFundtype(1);
            serviceFundflow.setApplytype("0");
            serviceFundflow.setFlowconclusion(CheckFlag);
@@ -527,8 +529,8 @@
            SimpleDateFormat sd = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
            return "审批人：" + managerName + " & 审批时间：" + sd.format(new Date()) + " & 审批结果：通过";
        }

        Optional<ServiceFundflow> lastApproval = serviceFundflows.stream().filter(flow -> flow.getCheckusername().contains(managerName)).max(Comparator.comparing(ServiceFundflow::getCreateTime));
        String mn = managerName.trim();
        Optional<ServiceFundflow> lastApproval = serviceFundflows.stream().filter(flow -> flow.getCheckusername().contains(mn)).max(Comparator.comparing(ServiceFundflow::getCreateTime));

        if (lastApproval.isPresent()) {
            ServiceFundflow flow = lastApproval.get();
@@ -768,7 +770,7 @@
        formmain_1209.put("开户银行-作废", "");
        formmain_1209.put("卡号-作废", "");
        formmain_1209.put("支付方式", serviceReimbursementShared.getZffs());
        formmain_1209.put("组长", serviceReimbursementShared.getManagername());
        formmain_1209.put("组长", getLastApprovalInfo(serviceFundflows, serviceReimbursementShared.getManagername()));
        formmain_1209.put("审批人员", getLastApprovalInfo(serviceFundflows, serviceReimbursementShared.getFinancechecher()));
        formmain_1209.put("支付日期", serviceReimbursementShared.getRiqi());
        formmain_1209.put("上传附件", "");