ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundServiceImpl.java
@@ -177,7 +177,7 @@ serviceFundSharedMapper.delfundsharedInfoById(null, serviceFund1.getId()); //这个消息发送，就不在这做了，在审批记录的接口里做（即日志接口） //sendMeg(serviceFund1.getApplytype(), sysUser.getPhonenumber()); // sendMeg(serviceFund1.getApplytype(), sysUser.getPhonenumber()); } return true; @@ -422,7 +422,8 @@ SysUser user = loginUser.getUser(); if (serviceFund.getFlowlevel() == Long.valueOf(serviceFundflowrules.get(0).getFlowlevel() - 1) && serviceFund.getBackflowlevel() == 100) { log.info("财务退回再提交，出纳再次审批，之后提交到财务"); serviceFund.setFinancechecher("审批人：" + user.getNickName() + " & 审批时间" + new SimpleDateFormat("yyyyMMddHHmmss").format(new Date()) + " & 审批结果：通过"); // serviceFund.setFinancechecher("审批人：" + user.getNickName() + " & 审批时间" + new SimpleDateFormat("yyyyMMddHHmmss").format(new Date()) + " & 审批结果：通过"); serviceFund.setFinancechecher(user.getNickName()); serviceFund.setFlowlevel(serviceFundflowrules.get(0).getTotallevel().longValue()); serviceFund.setRecordstatus(99); @@ -455,7 +456,8 @@ List<Integer> roleIds = sysUserRoleMapper.getUserRoleByUserId(user.getUserId()); if (roleIds != null && roleIds.contains(11)) { //11为财务 serviceFund.setFinancechecher("审批人：" + user.getNickName() + " & 审批时间" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()) + " & 审批结果：通过"); // serviceFund.setFinancechecher("审批人：" + user.getNickName() + " & 审批时间" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()) + " & 审批结果：通过"); serviceFund.setFinancechecher(user.getNickName()); } //记录一下，下一级的审批，以便于下一级退回后，发起者提交时，能再提到当前审批层级 @@ -767,7 +769,7 @@ formmain_0831.put("中心负责人审批", serviceFund.getOpochecker()); formmain_0831.put("支付方式", serviceFund.getZffs()); formmain_0831.put("组长", getLastApprovalInfo(serviceFundflows, serviceFund.getManagername())); formmain_0831.put("审批人员", getLastApprovalInfo(serviceFundflows, serviceFund.getFinancechecher())); formmain_0831.put("审批人员", StringUtils.isEmpty(getLastApprovalInfo(serviceFundflows, serviceFund.getFinancechecher())) ? "陈慕华" : getLastApprovalInfo(serviceFundflows, serviceFund.getFinancechecher())); formmain_0831.put("支付日期", serviceFund.getRiqi()); formmain_0831.put("识别人-作废", null); formmain_0831.put("财务审批签字", serviceFund.getFinancedirector()); @@ -795,6 +797,7 @@ public String getLastApprovalInfo(List<ServiceFundflow> serviceFundflows, String managerName) { log.info("---------------serviceFundflows的入参为：{},managerName的值为：{}", serviceFundflows, managerName); if (StringUtils.isEmpty(managerName)) return ""; if (CollectionUtils.isEmpty(serviceFundflows)) { //如果是最后一个人审批，这个时候可能flow里还没有生成进去 @@ -802,7 +805,7 @@ return "审批人：" + managerName + " & 审批时间：" + sd.format(new Date()) + " & 审批结果：通过"; } Optional<ServiceFundflow> lastApproval = serviceFundflows.stream().filter(flow -> flow.getCheckusername().contains(managerName)).max(Comparator.comparing(ServiceFundflow::getCheckTime)); Optional<ServiceFundflow> lastApproval = serviceFundflows.stream().filter(flow -> managerName.contains(flow.getCheckusername())).max(Comparator.comparing(ServiceFundflow::getCreateTime)); if (lastApproval.isPresent()) { ServiceFundflow flow = lastApproval.get(); ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceReimbursementServiceImpl.java
@@ -359,7 +359,8 @@ log.info("出差补贴被 财务退回再提交，出纳再次审批，之后提交到财务:{}", serviceReimbursement.getId()); //说明是财务退回再提交的.需要出纳再看一遍，没问题之后，往分享表里新增 // serviceReimbursementService.addSharedData(serviceReimbursement.getId()); serviceReimbursement.setFinancechecher("审批人：" + user.getNickName() + " & 审批时间" + new SimpleDateFormat("yyyyMMddHHmmss").format(new Date()) + " & 审批结果：通过"); // serviceReimbursement.setFinancechecher("审批人：" + user.getNickName() + " & 审批时间" + new SimpleDateFormat("yyyyMMddHHmmss").format(new Date()) + " & 审批结果：通过"); serviceReimbursement.setFinancechecher(user.getNickName()); serviceReimbursement.setFlowlevel(serviceFundflowrules.get(0).getTotallevel().longValue()); serviceReimbursement.setRecordstatus(99); serviceReimbursement.setUploadStates(1); @@ -394,7 +395,8 @@ List<Integer> roleIds = sysUserRoleMapper.getUserRoleByUserId(user.getUserId()); if (roleIds != null && roleIds.contains(11)) { //11为财务 serviceReimbursement.setFinancechecher("审批人：" + user.getNickName() + " & 审批时间" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()) + " & 审批结果：通过"); // serviceReimbursement.setFinancechecher("审批人：" + user.getNickName() + " & 审批时间" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()) + " & 审批结果：通过"); serviceReimbursement.setFinancechecher(user.getNickName()); } } else { @@ -526,14 +528,12 @@ return "审批人：" + managerName + " & 审批时间：" + sd.format(new Date()) + " & 审批结果：通过"; } Optional<ServiceFundflow> lastApproval = serviceFundflows.stream() .filter(flow -> flow.getCheckusername().contains(managerName)) .max(Comparator.comparing(ServiceFundflow::getCheckTime)); Optional<ServiceFundflow> lastApproval = serviceFundflows.stream().filter(flow -> flow.getCheckusername().contains(managerName)).max(Comparator.comparing(ServiceFundflow::getCreateTime)); if (lastApproval.isPresent()) { ServiceFundflow flow = lastApproval.get(); SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); if(flow.getCheckTime()==null){ if (flow.getCheckTime() == null) { flow.setCheckTime(new Date()); } String formattedTime = sdf.format(flow.getCheckTime()); @@ -572,13 +572,11 @@ // 主表字段数据 Map<String, Object> data2 = new HashMap<>(); data2.put("formmain_1209", formmain_1209(serviceReimbursementSharedList.get(0))); // 明细表字段数据，与附件的处理 Map<String, List<Map<String, Object>>> map1 = formson_1210(serviceReimbursementdetailShareds); data2.put("formson_1210", map1.get("formson_1210")); data2.put("thirdAttachments", map1.get("annexfilesList")); data2.put("formson_1211", formson_1211(serviceReimbursementpayeeShareds)); data.put("data", data2); //模板编号，由致远方提供，该参数决定发起协同系统中哪个流程 data.put("templateCode", "cyfbxd_rzhc_ceshi"); @@ -592,7 +590,6 @@ data.put("subject", ""); ServiceReimbursement serviceReimbursement1 = serviceReimbursementMapper.selectById(serviceReimbursement.getId()); data.put("summaryId", serviceReimbursement1.getSummaryId() == null ? "" : serviceReimbursement1.getSummaryId()); map.put("data", data); String strRes = null; if (!active.equals("druid")) { @@ -600,7 +597,6 @@ String token = getToken(); JSONObject json1 = JSONObject.parseObject(token); token = json1.get("id").toString(); ObjectMapper objectMapper = new ObjectMapper(); String json = null; try { @@ -846,6 +842,7 @@ System.out.println("uploadOAFileAndUpdateDb + jsonObject" + jsonObj.toString() + "\r\n" + jsonObj.toJSONString()); String strRes = HttpClientKit.postOpr(strUrl, jsonObj.toString()); log.info("-----------------strRes-----的值为：{}", strRes); return strRes; }
@@ -33,6 +33,7 @@ <result property="deptmentname" column="DeptmentName"/> <result property="opochecker" column="OPOchecker"/> <result property="finvicepresident" column="FinVicePresident"/> <result property="financechecher" column="FinanceChecher"/> <result property="president" column="president"/> <result property="busvicepresident" column="BusVicePresident"/> <result property="officedirector" column="OfficeDirector"/>
