ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundServiceImpl.java
@@ -519,21 +519,18 @@ log.info("sserviceFund保存的的值是-------- :{}", aBoolean); //办公室审批通过之后，就需要把“办公室主任”的名字填上 List<SysUser> sysUsers =null; SysUser sysUsers = null; if(StringUtils.isNotEmpty(user.getUserName())) { SysUser su = new SysUser(); su.setUserName(user.getUserName()); sysUsers = sysUserMapper.selectAllocatedList(su); sysUsers = sysUserMapper.selectUserByUserName(user.getUserName()); log.info("费用sysUsers返回的值为:{}", sysUsers); } if (checkFundVO.getFlowconclusion() == 1 && sysUsers != null && !sysUsers.isEmpty() && sysUsers.get(0).getRoles() != null && sysUsers.get(0).getRoles().stream().anyMatch(role -> "officedirector".equals(role.getRoleKey()))) { if (checkFundVO.getFlowconclusion() == 1 && sysUsers != null && sysUsers.getRoles() != null && sysUsers.getRoles().stream().anyMatch(role -> "officedirector".equals(role.getRoleKey()))) { serviceFund.setOfficedirector(user.getNickName()); serviceFund.setUploadStates(1); //数据发送 Boolean aBoolean1 = null; if (newSwitch == 1) { log.info("费用newSwitch返回的值为:{}", newSwitch); //搞一个开关，别影响老流程 aBoolean1 = sendData(serviceFund); if (!aBoolean1) { @@ -782,16 +779,17 @@ formmain_0831.put("财务审批", null); formmain_0831.put("财务部负责人审批", getLastApprovalInfo(serviceFundflows, serviceFund.getFinancedirector())); // formmain_0831.put("办公室主任审批", "办公室主任审批", "审批人：周育成 & 审批时间：" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()) + " & 审批结果：通过"); // formmain_0831.put("办公室主任审批", "办公室主任审批", "审批人：吴志强 & 审批时间：" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()) + " & 审批结果：通过"); if (serviceFund.getBackflowlevel() == 3) formmain_0831.put("办公室主任审批", "审批人：周育成 & 审批时间：" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()) + " & 审批结果：通过"); else formmain_0831.put("办公室主任审批", getLastApprovalInfo(serviceFundflows, "周育成")); formmain_0831.put("办公室主任审批", "审批人：吴志强 & 审批时间：" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()) + " & 审批结果：通过"); else formmain_0831.put("办公室主任审批", getLastApprovalInfo(serviceFundflows, "吴志强")); formmain_0831.put("业务副院长审批", serviceFund.getBusvicepresident()); formmain_0831.put("财务副院长审批", serviceFund.getFinvicepresident()); formmain_0831.put("中心负责人审批", serviceFund.getOpochecker()); formmain_0831.put("支付方式", serviceFund.getZffs()); formmain_0831.put("组长", getLastApprovalInfo(serviceFundflows, serviceFund.getManagername())); String lastApprovalInfo = getLastApprovalInfo(serviceFundflows, serviceFund.getManagername()); formmain_0831.put("组长", lastApprovalInfo.contains("吴志强") ? null : lastApprovalInfo); formmain_0831.put("审批人员", StringUtils.isEmpty(getLastApprovalInfo(serviceFundflows, serviceFund.getFinancechecher())) ? "陈慕华" : getLastApprovalInfo(serviceFundflows, serviceFund.getFinancechecher())); formmain_0831.put("支付日期", serviceFund.getRiqi()); formmain_0831.put("识别人-作废", null); ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceReimbursementServiceImpl.java
@@ -447,7 +447,8 @@ map.put("审批人：", loginUser.getUser().getUserName()); map.put("审批时间：", new Date()); map.put("意见：", "不通过"); if (StringUtils.isNotBlank(checkFundVO.getFlowcontent())) map.put("意见：", checkFundVO.getFlowcontent()); if (StringUtils.isNotBlank(checkFundVO.getFlowcontent())) map.put("意见：", checkFundVO.getFlowcontent()); contentList.add(map); DingTalkReqVo dingTalkReqVo = new DingTalkReqVo(); dingTalkReqVo.setTitle("财务系统驳回信息"); @@ -494,22 +495,19 @@ } //办公室主任审批通过之后，就需要把“办公室主任”的名字填上 List<SysUser> sysUsers =null; SysUser sysUser = null; if(StringUtils.isNotEmpty(user.getUserName())) { SysUser su = new SysUser(); su.setUserName(user.getUserName()); sysUsers = sysUserMapper.selectAllocatedList(su); log.info("差旅sysUsers返回的值为:{}", sysUsers); sysUser = sysUserMapper.selectUserByUserName(user.getUserName()); log.info("差旅sysUsers返回的值为:{}", sysUser); } if (checkFundVO.getFlowconclusion() == 1 && !sysUsers.isEmpty() && sysUsers.get(0).getRoles() != null && sysUsers.get(0).getRoles().stream().anyMatch(role -> "officedirector".equals(role.getRoleKey()))){ if (checkFundVO.getFlowconclusion() == 1 && Objects.nonNull(sysUser) && sysUser.getRoles() != null && sysUser.getRoles().stream().anyMatch(role -> "officedirector".equals(role.getRoleKey()))) { serviceReimbursement.setOfficedirector(user.getNickName()); serviceReimbursement.setUploadStates(1); Boolean aBoolean1 = null; if (newSwitch == 1) { log.info("差旅newSwitch返回的值为:{}", newSwitch); aBoolean1 = sendData(serviceReimbursement); if (!aBoolean1) { allMap.put("500", "发送失败"); @@ -795,8 +793,8 @@ formmain_1209.put("财务审批", ""); formmain_1209.put("财务部负责人审批", getLastApprovalInfo(serviceFundflows, serviceReimbursement.getFinancedirector())); if (serviceReimbursement.getBackflowlevel() == 3) formmain_1209.put("办公室主任审批", "审批人：周育成 & 审批时间：" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()) + " & 审批结果：通过"); else formmain_1209.put("办公室主任审批", getLastApprovalInfo(serviceFundflows, "周育成")); formmain_1209.put("办公室主任审批", "审批人：吴志强 & 审批时间：" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()) + " & 审批结果：通过"); else formmain_1209.put("办公室主任审批", getLastApprovalInfo(serviceFundflows, "吴志强")); formmain_1209.put("备注", serviceReimbursement.getRemark()); formmain_1209.put("业务副院长审批", serviceReimbursement.getBusvicepresident()); @@ -805,7 +803,8 @@ formmain_1209.put("开户银行-作废", ""); formmain_1209.put("卡号-作废", ""); formmain_1209.put("支付方式", serviceReimbursement.getZffs()); formmain_1209.put("组长", getLastApprovalInfo(serviceFundflows, serviceReimbursement.getManagername())); String lastApprovalInfo = getLastApprovalInfo(serviceFundflows, serviceReimbursement.getManagername()); formmain_1209.put("组长", lastApprovalInfo.contains("吴志强") ? null : lastApprovalInfo); formmain_1209.put("审批人员", getLastApprovalInfo(serviceFundflows, "陈慕华")); formmain_1209.put("支付日期", serviceReimbursement.getRiqi()); formmain_1209.put("上传附件", "");
