钉钉通知调整

sinake

10 天以前 13a735f1870f01f7d8f13db3de2d0359d928fde0

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

@@ -476,27 +476,27 @@
                        FlowLevel = 0;
                    }
                }
                SysUser sysUser = sysUserService.selectUserByUserName(serviceReimbursement.getUserno());
                //审批未通过：单据信息 + 出差信息 + 审批人/审批时间/意见（意见 = "审批未通过。" + 驳回意见）
                List<ConcurrentHashMap<String, Object>> contentList = FundNotifyMessageBuilder.newRows();
                FundNotifyMessageBuilder.addBillInfo(contentList, "0", serviceReimbursement.getUsername(),
                        serviceReimbursement.getAmountrequested(), null,
                        FundNotifyMessageBuilder.billNo(serviceReimbursement.getBh(),
                                serviceReimbursement.getId()));
                FundNotifyMessageBuilder.addTravelInfo(contentList, serviceReimbursement.getTravelers(),
                        serviceReimbursement.getReason());
                FundNotifyMessageBuilder.addAuditResult(contentList, loginUser.getUser().getNickName(), new Date(),
                        FundNotifyMessageBuilder.opinion(FundNotifyMessageBuilder.CONCLUSION_REJECT,
                                checkFundVO.getFlowcontent()));
                try {
                    DingTalkReqVo dingTalkReqVo = new DingTalkReqVo();
                    dingTalkReqVo.setTitle(FundNotifyMessageBuilder.TITLE);
                    dingTalkReqVo.setNumber(sysUser.getPhonenumber());
                    dingTalkReqVo.setContents(contentList);
                    dingTalkService.sendNotification(dingTalkReqVo);
                } catch (Exception e) {
                    log.error("差旅---审批未通过钉钉通知失败，id={}", serviceReimbursement.getId(), e);
                }
            }
            SysUser sysUser = sysUserService.selectUserByUserName(serviceReimbursement.getUserno());
            //审批未通过：单据信息 + 出差信息 + 审批人/审批时间/意见（意见 = "审批未通过。" + 驳回意见）
            List<ConcurrentHashMap<String, Object>> contentList = FundNotifyMessageBuilder.newRows();
            FundNotifyMessageBuilder.addBillInfo(contentList, "0", serviceReimbursement.getUsername(),
                    serviceReimbursement.getAmountrequested(), null,
                    FundNotifyMessageBuilder.billNo(serviceReimbursement.getBh(),
                            serviceReimbursement.getId()));
            FundNotifyMessageBuilder.addTravelInfo(contentList, serviceReimbursement.getTravelers(),
                    serviceReimbursement.getReason());
            FundNotifyMessageBuilder.addAuditResult(contentList, loginUser.getUser().getNickName(), new Date(),
                    FundNotifyMessageBuilder.opinion(checkFundVO.getFlowconclusion()+"",
                            checkFundVO.getFlowcontent()));
            try {
                DingTalkReqVo dingTalkReqVo = new DingTalkReqVo();
                dingTalkReqVo.setTitle(FundNotifyMessageBuilder.TITLE);
                dingTalkReqVo.setNumber(sysUser.getPhonenumber());
                dingTalkReqVo.setContents(contentList);
                dingTalkService.sendNotification(dingTalkReqVo);
            } catch (Exception e) {
                log.error("差旅---审批未通过钉钉通知失败，id={}", serviceReimbursement.getId(), e);
            }

            serviceReimbursement.setRecordstatus(RecordStatus);
@@ -537,7 +537,7 @@

            }
            //办公室主任审批通过之后，就需要把“办公室主任”的名字填上
            SysUser sysUser = null;
            //SysUser sysUser = null;
            if (StringUtils.isNotEmpty(user.getUserName())) {
                sysUser = sysUserMapper.selectUserByUserName(user.getUserName());
                log.info("差旅sysUsers返回的值为:{}", sysUser);