From 13a735f1870f01f7d8f13db3de2d0359d928fde0 Mon Sep 17 00:00:00 2001
From: sinake <sinake1@qq.com>
Date: 星期三, 14 十月 2026 15:34:42 +0800
Subject: [PATCH] 钉钉通知调整
---
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundServiceImpl.java | 42 ++++++++++-----------
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceReimbursementServiceImpl.java | 46 +++++++++++-----------
2 files changed, 43 insertions(+), 45 deletions(-)
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundServiceImpl.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundServiceImpl.java
index 8fa2965..17d1ed3 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundServiceImpl.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundServiceImpl.java
@@ -545,7 +545,7 @@
//璁板綍涓�涓嬶紝涓嬩竴绾х殑瀹℃壒锛屼互渚夸簬涓嬩竴绾ч��鍥炲悗锛屽彂璧疯�呮彁浜ゆ椂锛岃兘鍐嶆彁鍒板綋鍓嶅鎵瑰眰绾�
serviceFund.setBackflowlevel(FlowLevel);
- } //else {
+ } else {
CheckFlag = 2;
if (CheckFlag == 2) {
//搴斿尰闄㈣姹傚鏋滃嚭鐜伴��鍥烇紝鐩存帴閫�鍒板彂璧疯��
@@ -559,27 +559,25 @@
FlowLevel = 0;
}
}
-
- SysUser sysUser = sysUserService.selectUserByUserName(serviceFund.getUserno());
- //瀹℃壒鏈�氳繃锛氬崟鎹俊鎭� + 瀹℃壒浜�/瀹℃壒鏃堕棿/鎰忚锛堟剰瑙� = "瀹℃壒鏈�氳繃銆�" + 椹冲洖鎰忚锛�
- List<ConcurrentHashMap<String, Object>> contentList = FundNotifyMessageBuilder.newRows();
- FundNotifyMessageBuilder.addBillInfo(contentList, serviceFund.getApplytype(),
- serviceFund.getUsername(), serviceFund.getPretaxcost(), serviceFund.getDonorname(),
- FundNotifyMessageBuilder.billNo(serviceFund.getBh(), serviceFund.getId()));
- 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("璐圭敤---瀹℃壒鏈�氳繃閽夐拤閫氱煡澶辫触锛宖undId={}", serviceFund.getId(), e);
- }
- //}
-
+ }
+ SysUser sysUser = sysUserService.selectUserByUserName(serviceFund.getUserno());
+ //瀹℃壒鏈�氳繃锛氬崟鎹俊鎭� + 瀹℃壒浜�/瀹℃壒鏃堕棿/鎰忚锛堟剰瑙� = "瀹℃壒鏈�氳繃銆�" + 椹冲洖鎰忚锛�
+ List<ConcurrentHashMap<String, Object>> contentList = FundNotifyMessageBuilder.newRows();
+ FundNotifyMessageBuilder.addBillInfo(contentList, serviceFund.getApplytype(),
+ serviceFund.getUsername(), serviceFund.getPretaxcost(), serviceFund.getDonorname(),
+ FundNotifyMessageBuilder.billNo(serviceFund.getBh(), serviceFund.getId()));
+ 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("璐圭敤---瀹℃壒鏈�氳繃閽夐拤閫氱煡澶辫触锛宖undId={}", serviceFund.getId(), e);
+ }
serviceFund.setRecordstatus(RecordStatus);
serviceFund.setFlowlevel(FlowLevel.longValue());
// serviceFund.setBackflowlevel(serviceFund.getFlowlevel());
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceReimbursementServiceImpl.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceReimbursementServiceImpl.java
index c94ba07..1be0321 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceReimbursementServiceImpl.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceReimbursementServiceImpl.java
@@ -461,7 +461,7 @@
serviceReimbursement.setFinancechecher(user.getNickName());
}
- } //else {
+ } else {
CheckFlag = 2;
if (CheckFlag == 2) {
@@ -476,28 +476,28 @@
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(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("宸梾---瀹℃壒鏈�氳繃閽夐拤閫氱煡澶辫触锛宨d={}", 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("宸梾---瀹℃壒鏈�氳繃閽夐拤閫氱煡澶辫触锛宨d={}", serviceReimbursement.getId(), e);
+ }
serviceReimbursement.setRecordstatus(RecordStatus);
serviceReimbursement.setFlowlevel(Long.valueOf(FlowLevel.toString()));
--
Gitblit v1.9.3