ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundServiceImpl.java
@@ -422,8 +422,7 @@ SysUser user = loginUser.getUser(); if (serviceFund.getFlowlevel() == Long.valueOf(serviceFundflowrules.get(0).getFlowlevel() - 1) && serviceFund.getBackflowlevel() == 100) { log.info("财务退回再提交，出纳再次审批，之后提交到财务"); // serviceFund.setFinancechecher("审批人：" + user.getUserName() + " & 审批时间" + new SimpleDateFormat("yyyyMMddHHmmss").format(new Date()) + " & 审批结果：通过"); serviceFund.setFinancechecher(user.getNickName()); serviceFund.setFinancechecher("审批人：" + user.getNickName() + " & 审批时间" + new SimpleDateFormat("yyyyMMddHHmmss").format(new Date()) + " & 审批结果：通过"); serviceFund.setFlowlevel(serviceFundflowrules.get(0).getTotallevel().longValue()); serviceFund.setRecordstatus(99); @@ -456,8 +455,7 @@ List<Integer> roleIds = sysUserRoleMapper.getUserRoleByUserId(user.getUserId()); if (roleIds != null && roleIds.contains(11)) { //11为财务 // serviceFund.setFinancechecher("审批人：" + user.getUserName() + " & 审批时间" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()) + " & 审批结果：通过"); serviceFund.setFinancechecher(user.getNickName()); serviceFund.setFinancechecher("审批人：" + user.getNickName() + " & 审批时间" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()) + " & 审批结果：通过"); } //记录一下，下一级的审批，以便于下一级退回后，发起者提交时，能再提到当前审批层级 @@ -469,7 +467,6 @@ FlowLevel = 0; RecordStatus = -1; log.info("serviceFund进来了吗？？？？？？ :{},{}", RecordStatus, FlowLevel); System.out.println("serviceFund进来了吗？？？？？？"); } else { RecordStatus = (FlowLevel + 1) * 2 - 1; FlowLevel = (FlowLevel - 1); @@ -517,7 +514,7 @@ //053审批通过之后，就需要把“办公室主任”的名字填上 if (checkFundVO.getFlowconclusion() == 1 && user.getUserName().equals("053")) { serviceFund.setOfficedirector(user.getNickName()); serviceFund.setOfficedirector("审批人：" + user.getNickName() + " & 审批时间" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()) + " & 审批结果：通过"); serviceFund.setUploadStates(1); //数据发送 Boolean aBoolean1 = null; ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceReimbursementServiceImpl.java
@@ -359,8 +359,7 @@ log.info("出差补贴被 财务退回再提交，出纳再次审批，之后提交到财务:{}", serviceReimbursement.getId()); //说明是财务退回再提交的.需要出纳再看一遍，没问题之后，往分享表里新增 // serviceReimbursementService.addSharedData(serviceReimbursement.getId()); // serviceReimbursement.setFinancechecher("审批人：" + user.getUserName() + " & 审批时间" + new SimpleDateFormat("yyyyMMddHHmmss").format(new Date()) + " & 审批结果：通过"); serviceReimbursement.setFinancechecher(user.getNickName()); serviceReimbursement.setFinancechecher("审批人：" + user.getNickName() + " & 审批时间" + new SimpleDateFormat("yyyyMMddHHmmss").format(new Date()) + " & 审批结果：通过"); serviceReimbursement.setFlowlevel(serviceFundflowrules.get(0).getTotallevel().longValue()); serviceReimbursement.setRecordstatus(99); serviceReimbursement.setUploadStates(1); @@ -395,8 +394,7 @@ List<Integer> roleIds = sysUserRoleMapper.getUserRoleByUserId(user.getUserId()); if (roleIds != null && roleIds.contains(11)) { //11为财务 // serviceReimbursement.setFinancechecher("审批人：" + user.getUserName() + " & 审批时间" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()) + " & 审批结果：通过"); serviceReimbursement.setFinancechecher(user.getNickName()); serviceReimbursement.setFinancechecher("审批人：" + user.getNickName() + " & 审批时间" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()) + " & 审批结果：通过"); } } else { @@ -467,7 +465,7 @@ } //053审批通过之后，就需要把“办公室主任”的名字填上 if (checkFundVO.getFlowconclusion() == 1 && user.getUserName().equals("053")) { serviceReimbursement.setOfficedirector(user.getNickName()); serviceReimbursement.setOfficedirector("审批人：" + user.getNickName() + " & 审批时间" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()) + " & 审批结果：通过"); serviceReimbursement.setUploadStates(1); Boolean aBoolean1 = null;
