From 068519d38ca60263d939ef8fc0522cce07212b93 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 05 九月 2025 15:17:42 +0800
Subject: [PATCH] 审批日志
---
ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java | 4 +-
ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFund.java | 6 +++
ruoyi-admin/src/main/resources/application-druid.yml | 5 ++
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundServiceImpl.java | 69 ++++++++++++++++++----------------
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceReimbursementServiceImpl.java | 22 ++++++----
ruoyi-admin/src/main/resources/application.yml | 2
6 files changed, 63 insertions(+), 45 deletions(-)
diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml
index 4af78d2..7c852e5 100644
--- a/ruoyi-admin/src/main/resources/application-druid.yml
+++ b/ruoyi-admin/src/main/resources/application-druid.yml
@@ -9,7 +9,10 @@
# 寮�鍙戠幆澧�
url: jdbc:mysql://116.62.18.175:6002/opo?allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8
username: opo
- password: Smartor.2023
+ password: opo@2022
+ # url: jdbc:mysql://192.168.100.10:3306/opo?allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8
+ # username: opo
+ # password: Smartor.2023
# 浠庡簱鏁版嵁婧�
slave:
diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index cd33931..6d46c20 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -53,7 +53,7 @@
# 鍥介檯鍖栬祫婧愭枃浠惰矾寰�
basename: i18n/messages
profiles:
- active: druid
+ active: srm
# 鏂囦欢涓婁紶
servlet:
multipart:
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFund.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFund.java
index 8b24dc3..edd6442 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFund.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFund.java
@@ -396,6 +396,12 @@
@ApiModelProperty("鍗忓弸瑕佹眰鍐嶆鍙戣捣鏃讹紝甯︿笂杩欎釜鍊�")
private String summaryId;
+ /**
+ * 鍙戞斁鐘舵��
+ */
+ @ApiModelProperty("鍙戞斁鐘舵��")
+ @Excel(name = "鍙戞斁鐘舵��")
+ private String isdistribute;
}
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 4f24c58..cbe5522 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
@@ -45,6 +45,7 @@
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.atomic.AtomicLong;
import java.util.stream.Collectors;
/**
@@ -421,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.getUserName() + " & 瀹℃壒鏃堕棿" + new SimpleDateFormat("yyyyMMddHHmmss").format(new Date()) + " & 瀹℃壒缁撴灉锛氶�氳繃");
+// serviceFund.setFinancechecher("瀹℃壒浜猴細" + user.getUserName() + " & 瀹℃壒鏃堕棿" + new SimpleDateFormat("yyyyMMddHHmmss").format(new Date()) + " & 瀹℃壒缁撴灉锛氶�氳繃");
+ serviceFund.setFinancechecher(user.getNickName());
serviceFund.setFlowlevel(serviceFundflowrules.get(0).getTotallevel().longValue());
serviceFund.setRecordstatus(99);
@@ -454,7 +456,8 @@
List<Integer> roleIds = sysUserRoleMapper.getUserRoleByUserId(user.getUserId());
if (roleIds != null && roleIds.contains(11)) {
//11涓鸿储鍔�
- serviceFund.setFinancechecher("瀹℃壒浜猴細" + user.getUserName() + " & 瀹℃壒鏃堕棿" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()) + " & 瀹℃壒缁撴灉锛氶�氳繃");
+// serviceFund.setFinancechecher("瀹℃壒浜猴細" + user.getUserName() + " & 瀹℃壒鏃堕棿" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()) + " & 瀹℃壒缁撴灉锛氶�氳繃");
+ serviceFund.setFinancechecher(user.getNickName());
}
//璁板綍涓�涓嬶紝涓嬩竴绾х殑瀹℃壒锛屼互渚夸簬涓嬩竴绾ч��鍥炲悗锛屽彂璧疯�呮彁浜ゆ椂锛岃兘鍐嶆彁鍒板綋鍓嶅鎵瑰眰绾�
@@ -608,7 +611,7 @@
// 涓昏〃瀛楁鏁版嵁
Map<String, Object> data2 = new HashMap<>();
- data2.put("formmain_0831", getformmain_0831(fundShareInfos.get(0)));
+ data2.put("formmain_0831", getformmain_0831(serviceFund));
// 鏄庣粏琛ㄥ瓧娈垫暟鎹紝涓庨檮浠剁殑澶勭悊
Map<String, List<Map<String, Object>>> map1 = formson_0832(serviceFunddetailShareds);
data2.put("formson_0832", map1.get("formson_0832"));
@@ -679,6 +682,8 @@
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<>();
@@ -694,12 +699,12 @@
map.put("鏀剁泭浜哄灞炴垨涓撳", serviceFunddetailShared.getBeneficiaryname());
map.put("绋庡悗閲戦", serviceFunddetailShared.getTaxamount());
map.put("浣滃簾鏈�缁堥噾棰�", null);
- Long fpuuid = System.currentTimeMillis() + 5;
+ Long fpuuid = COUNTER.incrementAndGet();
map.put("鍙戠エ闄勪欢", fpuuid);
map.put("鍙戠エ璇嗗埆", null);
map.put("璇嗗埆浜�", null);
map.put("绋庨", null);
- long qtuuid = System.currentTimeMillis() + 20;
+ long qtuuid = COUNTER.incrementAndGet();
map.put("鍏朵粬闄勪欢", qtuuid);
map.put("椤圭洰缂栫爜", serviceFunddetailShared.getItemcode());
map.put("棰勭畻椤圭洰", null);
@@ -744,46 +749,46 @@
}
- private Map<String, Object> getformmain_0831(ServiceFundShared serviceFundShared) {
+ private Map<String, Object> getformmain_0831(ServiceFund serviceFund) {
Map<String, Object> formmain_0831 = new HashMap<>();
- formmain_0831.put("鎹愮尞鑰呭鍚�", serviceFundShared.getDonorname());
- formmain_0831.put("鎶ラ攢浜哄憳", serviceFundShared.getUsername());
- formmain_0831.put("涓氬姟鍖哄煙", serviceFundShared.getDeptmentname());
- formmain_0831.put("缁忔墜浜�", serviceFundShared.getUsername());
- formmain_0831.put("濉〃鏃堕棿", new SimpleDateFormat("yyyy-MM-dd HH:mm").format(serviceFundShared.getApplyTime()));
- formmain_0831.put("鎶ラ攢閲戦鍚堣", serviceFundShared.getPretaxcost());
+ formmain_0831.put("鎹愮尞鑰呭鍚�", serviceFund.getDonorname());
+ formmain_0831.put("鎶ラ攢浜哄憳", serviceFund.getUsername());
+ formmain_0831.put("涓氬姟鍖哄煙", serviceFund.getDeptmentname());
+ formmain_0831.put("缁忔墜浜�", serviceFund.getUsername());
+ formmain_0831.put("濉〃鏃堕棿", new SimpleDateFormat("yyyy-MM-dd HH:mm").format(serviceFund.getApplyTime()));
+ formmain_0831.put("鎶ラ攢閲戦鍚堣", serviceFund.getPretaxcost());
formmain_0831.put("涓婁紶闄勪欢", null);
formmain_0831.put("澶囨敞", null);
- formmain_0831.put("璐㈠姟瀹℃壒", serviceFundShared.getFinancechecher());
- formmain_0831.put("璐㈠姟閮ㄨ礋璐ｄ汉瀹℃壒", serviceFundShared.getFinancedirector());
- formmain_0831.put("鍔炲叕瀹や富浠诲鎵�", serviceFundShared.getOfficedirector());
- formmain_0831.put("涓氬姟鍓櫌闀垮鎵�", serviceFundShared.getBusvicepresident());
- formmain_0831.put("璐㈠姟鍓櫌闀垮鎵�", serviceFundShared.getFinvicepresident());
- formmain_0831.put("涓績璐熻矗浜哄鎵�", serviceFundShared.getOpochecker());
- formmain_0831.put("鏀粯鏂瑰紡", serviceFundShared.getZffs());
- formmain_0831.put("缁勯暱", null);
- formmain_0831.put("瀹℃壒浜哄憳", null);
- formmain_0831.put("鏀粯鏃ユ湡", serviceFundShared.getRiqi());
+ formmain_0831.put("璐㈠姟瀹℃壒", null);
+ formmain_0831.put("璐㈠姟閮ㄨ礋璐ｄ汉瀹℃壒", serviceFund.getFinancedirector());
+ formmain_0831.put("鍔炲叕瀹や富浠诲鎵�", serviceFund.getOfficedirector());
+ formmain_0831.put("涓氬姟鍓櫌闀垮鎵�", serviceFund.getBusvicepresident());
+ formmain_0831.put("璐㈠姟鍓櫌闀垮鎵�", serviceFund.getFinvicepresident());
+ formmain_0831.put("涓績璐熻矗浜哄鎵�", serviceFund.getOpochecker());
+ formmain_0831.put("鏀粯鏂瑰紡", serviceFund.getZffs());
+ formmain_0831.put("缁勯暱", serviceFund.getManagername());
+ formmain_0831.put("瀹℃壒浜哄憳", serviceFund.getFinancechecher());
+ formmain_0831.put("鏀粯鏃ユ湡", serviceFund.getRiqi());
formmain_0831.put("璇嗗埆浜�-浣滃簾", null);
- formmain_0831.put("璐㈠姟瀹℃壒绛惧瓧", serviceFundShared.getFinancedirector());
- formmain_0831.put("璐㈠姟閮ㄨ礋璐ｄ汉绛惧瓧", serviceFundShared.getFinancedirector());
+ formmain_0831.put("璐㈠姟瀹℃壒绛惧瓧", serviceFund.getFinancedirector());
+ formmain_0831.put("璐㈠姟閮ㄨ礋璐ｄ汉绛惧瓧", serviceFund.getFinancedirector());
formmain_0831.put("琛ㄨ揪绫诲瀷", null);
- formmain_0831.put("绋庡墠閲戦鍚堣", serviceFundShared.getPretaxcost());
- formmain_0831.put("绋庨鍚堣", serviceFundShared.getPretaxcost() - serviceFundShared.getTaxedcost());
+ formmain_0831.put("绋庡墠閲戦鍚堣", serviceFund.getPretaxcost());
+ formmain_0831.put("绋庨鍚堣", serviceFund.getPretaxcost() - serviceFund.getTaxedcost());
formmain_0831.put("琛ㄥ崟缂栧彿1", null);
formmain_0831.put("缂栫爜", null);
formmain_0831.put("CIF璐﹀閰嶇疆1", null);
formmain_0831.put(" 闄㈠尯", null);
- formmain_0831.put("鏄惁鏀粯", serviceFundShared.getIsdistribute());
+ formmain_0831.put("鏄惁鏀粯", serviceFund.getIsdistribute());
formmain_0831.put("鍑瘉鍙�", null);
formmain_0831.put("閾惰鍥炲崟", null);
formmain_0831.put("OFD", null);
formmain_0831.put("琛ㄥ崟闄勪欢", null);
formmain_0831.put("鐜伴噾娴侀噺鍒嗘瀽", null);
formmain_0831.put("鍑瘉绫诲埆", null);
- formmain_0831.put("绋庡悗閲戦鍚堣", serviceFundShared.getTaxedcost());
+ formmain_0831.put("绋庡悗閲戦鍚堣", serviceFund.getTaxedcost());
formmain_0831.put("鍘嗗彶瀹℃壒璁板綍", null);
- formmain_0831.put("琛ㄥ崟缂栧彿", serviceFundShared.getSerfunid());
+ formmain_0831.put("琛ㄥ崟缂栧彿", serviceFund.getId());
formmain_0831.put("鍘嗗彶瀹℃壒鍗曟煡璇�", null);
return formmain_0831;
}
@@ -1641,7 +1646,7 @@
Map<String, Object> map = new HashMap<String, Object>();
map.put("userName", "opo");
map.put("password", "4126407a-9821-4874-be41-6568abd6dbe5");
- map.put("loginName", "demo");
+ map.put("loginName", "OPO绯荤粺");
JSONObject jsonObj = new JSONObject(map);
@@ -1771,8 +1776,8 @@
serviceFundflow.setUpdateTime(new Date());
serviceFundflow.setFlowcontent(serviceProcessVO.getFlowcontent());
serviceFundflow.setFlowconclusion(StringUtils.isNotEmpty(serviceProcessVO.getFlowconclusion()) ? Integer.valueOf(serviceProcessVO.getFlowconclusion()) : null);
- if (serviceProcessVO.getApplytype() == "0") serviceFundflow.setFundtype(1);
- if (serviceProcessVO.getApplytype() == "1") serviceFundflow.setFundtype(2);
+ if (serviceProcessVO.getApplytype().equals("0")) serviceFundflow.setFundtype(1);
+ if (serviceProcessVO.getApplytype().equals("1")) serviceFundflow.setFundtype(2);
serviceFundflow.setFlowlevel(100);
serviceFundflow.setApplytype(serviceProcessVO.getApplytype());
serviceFundflow.setFundid(StringUtils.isNotEmpty(serviceProcessVO.getBackCode()) ? Long.valueOf(serviceProcessVO.getBackCode()) : null);
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 0cc543f..61603f5 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
@@ -41,6 +41,7 @@
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.atomic.AtomicLong;
/**
* 鎶ラ攢鐢宠Service涓氬姟灞傚鐞�
@@ -358,7 +359,8 @@
log.info("鍑哄樊琛ヨ创琚� 璐㈠姟閫�鍥炲啀鎻愪氦锛屽嚭绾冲啀娆″鎵癸紝涔嬪悗鎻愪氦鍒拌储鍔�:{}", serviceReimbursement.getId());
//璇存槑鏄储鍔￠��鍥炲啀鎻愪氦鐨�.闇�瑕佸嚭绾冲啀鐪嬩竴閬嶏紝娌￠棶棰樹箣鍚庯紝寰�鍒嗕韩琛ㄩ噷鏂板
// serviceReimbursementService.addSharedData(serviceReimbursement.getId());
- serviceReimbursement.setFinancechecher("瀹℃壒浜猴細" + user.getUserName() + " & 瀹℃壒鏃堕棿" + new SimpleDateFormat("yyyyMMddHHmmss").format(new Date()) + " & 瀹℃壒缁撴灉锛氶�氳繃");
+// serviceReimbursement.setFinancechecher("瀹℃壒浜猴細" + user.getUserName() + " & 瀹℃壒鏃堕棿" + new SimpleDateFormat("yyyyMMddHHmmss").format(new Date()) + " & 瀹℃壒缁撴灉锛氶�氳繃");
+ serviceReimbursement.setFinancechecher(user.getNickName());
serviceReimbursement.setFlowlevel(serviceFundflowrules.get(0).getTotallevel().longValue());
serviceReimbursement.setRecordstatus(99);
serviceReimbursement.setUploadStates(1);
@@ -393,7 +395,8 @@
List<Integer> roleIds = sysUserRoleMapper.getUserRoleByUserId(user.getUserId());
if (roleIds != null && roleIds.contains(11)) {
//11涓鸿储鍔�
- serviceReimbursement.setFinancechecher("瀹℃壒浜猴細" + user.getUserName() + " & 瀹℃壒鏃堕棿" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()) + " & 瀹℃壒缁撴灉锛氶�氳繃");
+// serviceReimbursement.setFinancechecher("瀹℃壒浜猴細" + user.getUserName() + " & 瀹℃壒鏃堕棿" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()) + " & 瀹℃壒缁撴灉锛氶�氳繃");
+ serviceReimbursement.setFinancechecher(user.getNickName());
}
} else {
@@ -607,9 +610,10 @@
return true;
}
+ private static final AtomicLong COUNTER = new AtomicLong(System.currentTimeMillis());
+
private Map<String, List<Map<String, Object>>> formson_1210(List<ServiceReimbursementdetailShared> serviceReimbursementdetailSharedList) {
Map<String, List<Map<String, Object>>> allMap = new HashMap<>();
-
List<Map<String, Object>> list = new ArrayList<>();
List<Map<String, Object>> annexfilesList = new ArrayList<>();
for (ServiceReimbursementdetailShared reimbursementdetailShared : serviceReimbursementdetailSharedList) {
@@ -638,12 +642,12 @@
map.put("浜哄憳绫诲埆", reimbursementdetailShared.getPersontype());
map.put("浣忓璐规爣鍑�", "");
map.put("浣忓璐规爣鍑嗗悎璁�", reimbursementdetailShared.getHotelexpense());
- Long fpuuid = System.currentTimeMillis();
+ Long fpuuid = COUNTER.incrementAndGet();
map.put("鍙戠エ闄勪欢", fpuuid);
map.put("绁ㄦ嵁璇嗗埆", "");
map.put("璇嗗埆浜�", "");
map.put("搴忓彿1", "");
- Long qtuuid = System.currentTimeMillis();
+ Long qtuuid = COUNTER.incrementAndGet();
map.put("鍏朵粬闄勪欢", qtuuid);
map.put("涓汉绁ㄥす鐢ㄦ埛", "");
map.put("璇嗗埆绁ㄦ嵁", "");
@@ -726,7 +730,7 @@
formmain_1209.put("鍏朵粬璐圭敤鍚堣", 0.00);
formmain_1209.put("棰嗘閲戦澶у啓", serviceReimbursementShared.getBigstrmoney());
formmain_1209.put("棰嗘閲戦", serviceReimbursementShared.getAmountrequested());
- formmain_1209.put("璐㈠姟瀹℃壒", serviceReimbursementShared.getFinancechecher());
+ formmain_1209.put("璐㈠姟瀹℃壒", "");
formmain_1209.put("璐㈠姟閮ㄨ礋璐ｄ汉瀹℃壒", serviceReimbursementShared.getFinancedirector());
formmain_1209.put("鍔炲叕瀹や富浠诲鎵�", serviceReimbursementShared.getOfficedirector());
formmain_1209.put("澶囨敞", serviceReimbursementShared.getRemark());
@@ -736,8 +740,8 @@
formmain_1209.put("寮�鎴烽摱琛�-浣滃簾", "");
formmain_1209.put("鍗″彿-浣滃簾", "");
formmain_1209.put("鏀粯鏂瑰紡", serviceReimbursementShared.getZffs());
- formmain_1209.put("缁勯暱", "");
- formmain_1209.put("瀹℃壒浜哄憳", "");
+ formmain_1209.put("缁勯暱", serviceReimbursementShared.getManagername());
+ formmain_1209.put("瀹℃壒浜哄憳", serviceReimbursementShared.getFinancechecher());
formmain_1209.put("鏀粯鏃ユ湡", serviceReimbursementShared.getRiqi());
formmain_1209.put("涓婁紶闄勪欢", "");
formmain_1209.put("鎵撴鍚堣", 0.00);
@@ -804,7 +808,7 @@
Map<String, Object> map = new HashMap<String, Object>();
map.put("userName", "opo");
map.put("password", "4126407a-9821-4874-be41-6568abd6dbe5");
- map.put("loginName", "demo");
+ map.put("loginName", "OPO绯荤粺");
JSONObject jsonObj = new JSONObject(map);
diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java
index 0f41336..31ebdfd 100644
--- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java
+++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java
@@ -101,7 +101,7 @@
serviceFundService.updateById(serviceFund1);
SysUser sysUser = sysUserService.selectUserByUserName(serviceFund1.getUserno());
- sendMeg(split, sysUser.getPhonenumber(), serviceFundShared.getApplytype(), 2, serviceFundShared.getSerfunid());
+// sendMeg(split, sysUser.getPhonenumber(), serviceFundShared.getApplytype(), 2, serviceFundShared.getSerfunid());
//鍙戦�佷俊鎭繚瀛�
ServiceSystemmessage serviceSystemmessage = new ServiceSystemmessage();
serviceSystemmessage.setFundtype(1);
@@ -345,7 +345,7 @@
SysUser sysUser = sysUserService.selectUserByUserName(serviceReimbursement1.getUserno());
//鍙戦�佷俊鎭繚瀛�
- sendMeg(split, sysUser.getPhonenumber(), "0" , 1, serviceReimbursementShared.getReimid());
+// sendMeg(split, sysUser.getPhonenumber(), "0" , 1, serviceReimbursementShared.getReimid());
ServiceSystemmessage serviceSystemmessage = new ServiceSystemmessage();
serviceSystemmessage.setFundtype(1);
serviceSystemmessage.setSenduserno(sysUser.getUserName());
--
Gitblit v1.9.3