ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundServiceImpl.java
@@ -445,6 +445,7 @@ serviceFundflow.setCheckuserno(user.getUserName()); serviceFundflow.setCheckusername(user.getNickName()); serviceFundflow.setFundtype(2); serviceFundflow.setCheckTime(new Date()); serviceFundflow.setApplytype(serviceFund.getApplytype()); serviceFundflow.setFlowconclusion(CheckFlag); serviceFundflow.setFlowcontent("通过"); @@ -504,6 +505,7 @@ serviceFundflow.setFundtype(2); serviceFundflow.setApplytype(serviceFund.getApplytype()); serviceFundflow.setFlowconclusion(CheckFlag); serviceFundflow.setCheckTime(new Date()); if (StringUtils.isNotBlank(checkFundVO.getFlowcontent())) { serviceFundflow.setFlowcontent(checkFundVO.getFlowcontent()); } else { @@ -1801,6 +1803,7 @@ serviceFundflow.setUpdateBy(serviceProcessVO.getCheckusername()); serviceFundflow.setCheckusername(serviceProcessVO.getCheckusername()); serviceFundflow.setCreateTime(new Date()); serviceFundflow.setCheckTime(new Date()); serviceFundflow.setUpdateTime(new Date()); serviceFundflow.setFlowcontent(serviceProcessVO.getFlowcontent()); serviceFundflow.setFlowconclusion(StringUtils.isNotEmpty(serviceProcessVO.getFlowconclusion()) ? Integer.valueOf(serviceProcessVO.getFlowconclusion()) : null); 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); @@ -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("上传附件", "");
