From 9c8b4a7d08ea43cccb5fd296d930ca55a2fa5a8a Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 22 七月 2026 13:21:23 +0800
Subject: [PATCH] 代码提交
---
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceReimbursementServiceImpl.java | 25 +++++++++++++++++++------
1 files changed, 19 insertions(+), 6 deletions(-)
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 a053db7..2d11ee2 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
@@ -25,6 +25,7 @@
import com.ruoyi.project.domain.vo.SpFinancialExpensesReimbursementOut;
import com.ruoyi.project.mapper.*;
import com.ruoyi.project.service.*;
+import com.ruoyi.system.mapper.SysUserMapper;
import com.ruoyi.system.mapper.SysUserRoleMapper;
import com.ruoyi.system.service.ISysPostService;
import com.ruoyi.system.service.ISysUserService;
@@ -79,6 +80,9 @@
@Autowired
IServiceReimbursementpayeeService payeeService;
+
+ @Autowired
+ SysUserMapper sysUserMapper;
@Autowired
IServiceFundflowruleService serviceFundflowruleService;
@@ -443,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("璐㈠姟绯荤粺椹冲洖淇℃伅");
@@ -489,13 +494,20 @@
}
}
- //053瀹℃壒閫氳繃涔嬪悗锛屽氨闇�瑕佹妸鈥滃姙鍏涓讳换鈥濈殑鍚嶅瓧濉笂
- if (checkFundVO.getFlowconclusion() == 1 && user.getUserName().equals("053")) {
+ //鍔炲叕瀹や富浠诲鎵归�氳繃涔嬪悗锛屽氨闇�瑕佹妸鈥滃姙鍏涓讳换鈥濈殑鍚嶅瓧濉笂
+ SysUser sysUser = null;
+ if (StringUtils.isNotEmpty(user.getUserName())) {
+ sysUser = sysUserMapper.selectUserByUserName(user.getUserName());
+ log.info("宸梾sysUsers杩斿洖鐨勫�间负:{}", sysUser);
+ }
+
+ 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", "鍙戦�佸け璐�");
@@ -781,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());
@@ -791,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("涓婁紶闄勪欢", "");
--
Gitblit v1.9.3