From 84a995c146ce6ab74709a503d010b03fb469e022 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期二, 21 七月 2026 15:01:57 +0800
Subject: [PATCH] 代码提交
---
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundServiceImpl.java | 19 +++++++++++++------
1 files changed, 13 insertions(+), 6 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 0434b71..c8939c6 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
@@ -21,6 +21,7 @@
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.bean.DtoConversionUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.project.common.IdGeneratorUtils;
import com.ruoyi.project.domain.*;
import com.ruoyi.project.domain.vo.*;
import com.ruoyi.project.mapper.*;
@@ -517,13 +518,21 @@
Boolean aBoolean = serviceFundflowService.saveData(serviceFundflow);
log.info("sserviceFund淇濆瓨鐨勭殑鍊兼槸-------- :{}", aBoolean);
- //053瀹℃壒閫氳繃涔嬪悗锛屽氨闇�瑕佹妸鈥滃姙鍏涓讳换鈥濈殑鍚嶅瓧濉笂
- if (checkFundVO.getFlowconclusion() == 1 && user.getUserName().equals("053")) {
+ //鍔炲叕瀹ゅ鎵归�氳繃涔嬪悗锛屽氨闇�瑕佹妸鈥滃姙鍏涓讳换鈥濈殑鍚嶅瓧濉笂
+ SysUser sysUsers =null;
+ if(StringUtils.isNotEmpty(user.getUserName())) {
+ sysUsers = sysUserMapper.selectUserByUserName(user.getUserName());
+ log.info("璐圭敤sysUsers杩斿洖鐨勫�间负:{}", sysUsers);
+ }
+ 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) {
@@ -682,8 +691,6 @@
return true;
}
- private static final AtomicLong COUNTER = new AtomicLong(System.currentTimeMillis());
-
private Map<String, List<Map<String, Object>>> formson_0832(List<ServiceFunddetailShared> serviceFunddetailSharedList) {
Map<String, List<Map<String, Object>>> allMap = new HashMap<>();
@@ -703,7 +710,7 @@
map.put("鏀剁泭浜哄灞炴垨涓撳", serviceFunddetailShared.getBeneficiaryname());
map.put("绋庡悗閲戦", serviceFunddetailShared.getTaxedamount());
map.put("浣滃簾鏈�缁堥噾棰�", null);
- Long fpuuid = COUNTER.incrementAndGet();
+ Long fpuuid = IdGeneratorUtils.nextId();
map.put("鍙戠エ闄勪欢", "");
if (StringUtils.isNotEmpty(invoicefiles)) {
map.put("鍙戠エ闄勪欢", fpuuid);
@@ -711,7 +718,7 @@
map.put("鍙戠エ璇嗗埆", null);
map.put("璇嗗埆浜�", null);
map.put("绋庨", serviceFunddetailShared.getTaxamount());
- long qtuuid = COUNTER.incrementAndGet();
+ long qtuuid = IdGeneratorUtils.nextId();
map.put("鍏朵粬闄勪欢", "");
if (StringUtils.isNotEmpty(annexfiles)) {
map.put("鍏朵粬闄勪欢", qtuuid);
--
Gitblit v1.9.3