From 0293e06edd011d6921ec2cc08392042f5765dfb8 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期四, 18 九月 2025 13:35:54 +0800
Subject: [PATCH] 日志修改
---
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceReimbursementServiceImpl.java | 71 ++++++++++++++++++-----------------
1 files changed, 37 insertions(+), 34 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 c8435be..32a4c69 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
@@ -359,7 +359,8 @@
log.info("鍑哄樊琛ヨ创琚� 璐㈠姟閫�鍥炲啀鎻愪氦锛屽嚭绾冲啀娆″鎵癸紝涔嬪悗鎻愪氦鍒拌储鍔�:{}", serviceReimbursement.getId());
//璇存槑鏄储鍔￠��鍥炲啀鎻愪氦鐨�.闇�瑕佸嚭绾冲啀鐪嬩竴閬嶏紝娌￠棶棰樹箣鍚庯紝寰�鍒嗕韩琛ㄩ噷鏂板
// serviceReimbursementService.addSharedData(serviceReimbursement.getId());
- serviceReimbursement.setFinancechecher("瀹℃壒浜猴細" + user.getNickName() + " & 瀹℃壒鏃堕棿" + new SimpleDateFormat("yyyyMMddHHmmss").format(new Date()) + " & 瀹℃壒缁撴灉锛氶�氳繃");
+// serviceReimbursement.setFinancechecher("瀹℃壒浜猴細" + user.getNickName() + " & 瀹℃壒鏃堕棿" + new SimpleDateFormat("yyyyMMddHHmmss").format(new Date()) + " & 瀹℃壒缁撴灉锛氶�氳繃");
+ serviceReimbursement.setFinancechecher(user.getNickName());
serviceReimbursement.setFlowlevel(serviceFundflowrules.get(0).getTotallevel().longValue());
serviceReimbursement.setRecordstatus(99);
serviceReimbursement.setUploadStates(1);
@@ -379,6 +380,7 @@
serviceFundflow.setCheckuserno(user.getUserName());
serviceFundflow.setCheckusername(user.getNickName());
serviceFundflow.setFundtype(1);
+ serviceFundflow.setCheckTime(new Date());
serviceFundflow.setApplytype("0");
serviceFundflow.setFlowconclusion(CheckFlag);
serviceFundflow.setFlowcontent("閫氳繃");
@@ -394,7 +396,8 @@
List<Integer> roleIds = sysUserRoleMapper.getUserRoleByUserId(user.getUserId());
if (roleIds != null && roleIds.contains(11)) {
//11涓鸿储鍔�
- serviceReimbursement.setFinancechecher("瀹℃壒浜猴細" + user.getNickName() + " & 瀹℃壒鏃堕棿" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()) + " & 瀹℃壒缁撴灉锛氶�氳繃");
+// serviceReimbursement.setFinancechecher("瀹℃壒浜猴細" + user.getNickName() + " & 瀹℃壒鏃堕棿" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()) + " & 瀹℃壒缁撴灉锛氶�氳繃");
+ serviceReimbursement.setFinancechecher(user.getNickName());
}
} else {
@@ -434,6 +437,7 @@
serviceFundflow.setFundid(serviceReimbursement.getId());
serviceFundflow.setCheckuserno(user.getUserName());
serviceFundflow.setCheckusername(user.getNickName());
+ serviceFundflow.setCheckTime(new Date());
serviceFundflow.setFundtype(1);
serviceFundflow.setApplytype("0");
serviceFundflow.setFlowconclusion(CheckFlag);
@@ -525,15 +529,13 @@
SimpleDateFormat sd = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
return "瀹℃壒浜猴細" + managerName + " & 瀹℃壒鏃堕棿锛�" + sd.format(new Date()) + " & 瀹℃壒缁撴灉锛氶�氳繃";
}
-
- Optional<ServiceFundflow> lastApproval = serviceFundflows.stream()
- .filter(flow -> flow.getCheckusername().contains(managerName))
- .max(Comparator.comparing(ServiceFundflow::getCheckTime));
+ String mn = managerName.trim();
+ Optional<ServiceFundflow> lastApproval = serviceFundflows.stream().filter(flow -> flow.getCheckusername().contains(mn)).max(Comparator.comparing(ServiceFundflow::getCreateTime));
if (lastApproval.isPresent()) {
ServiceFundflow flow = lastApproval.get();
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
- if(flow.getCheckTime()==null){
+ if (flow.getCheckTime() == null) {
flow.setCheckTime(new Date());
}
String formattedTime = sdf.format(flow.getCheckTime());
@@ -571,14 +573,13 @@
// 涓昏〃瀛楁鏁版嵁
Map<String, Object> data2 = new HashMap<>();
- data2.put("formmain_1209", formmain_1209(serviceReimbursementSharedList.get(0)));
-
+ ServiceReimbursement sr = serviceReimbursementMapper.selectById(serviceReimbursement.getId());
+ data2.put("formmain_1209", formmain_1209(sr));
// 鏄庣粏琛ㄥ瓧娈垫暟鎹紝涓庨檮浠剁殑澶勭悊
Map<String, List<Map<String, Object>>> map1 = formson_1210(serviceReimbursementdetailShareds);
data2.put("formson_1210", map1.get("formson_1210"));
data2.put("thirdAttachments", map1.get("annexfilesList"));
data2.put("formson_1211", formson_1211(serviceReimbursementpayeeShareds));
-
data.put("data", data2);
//妯℃澘缂栧彿锛岀敱鑷磋繙鏂规彁渚涳紝璇ュ弬鏁板喅瀹氬彂璧峰崗鍚岀郴缁熶腑鍝釜娴佺▼
data.put("templateCode", "cyfbxd_rzhc_ceshi");
@@ -592,7 +593,6 @@
data.put("subject", "");
ServiceReimbursement serviceReimbursement1 = serviceReimbursementMapper.selectById(serviceReimbursement.getId());
data.put("summaryId", serviceReimbursement1.getSummaryId() == null ? "" : serviceReimbursement1.getSummaryId());
-
map.put("data", data);
String strRes = null;
if (!active.equals("druid")) {
@@ -600,7 +600,6 @@
String token = getToken();
JSONObject json1 = JSONObject.parseObject(token);
token = json1.get("id").toString();
-
ObjectMapper objectMapper = new ObjectMapper();
String json = null;
try {
@@ -738,49 +737,52 @@
return list;
}
- private Map<String, Object> formmain_1209(ServiceReimbursementShared serviceReimbursementShared) {
+ private Map<String, Object> formmain_1209(ServiceReimbursement serviceReimbursement) {
ServiceFundflow serviceFundflow = new ServiceFundflow();
- serviceFundflow.setFundid(serviceReimbursementShared.getReimid());
+ serviceFundflow.setFundid(serviceReimbursement.getId());
serviceFundflow.setFundtype(1);
List<ServiceFundflow> serviceFundflows = serviceFundflowService.queryList(serviceFundflow);
Map<String, Object> formmain_1209 = new HashMap<>();
- formmain_1209.put("鎶ラ攢鏃ユ湡", new SimpleDateFormat("yyyy-MM-dd HH:mm").format(serviceReimbursementShared.getApplyTime()));
+ formmain_1209.put("鎶ラ攢鏃ユ湡", new SimpleDateFormat("yyyy-MM-dd HH:mm").format(serviceReimbursement.getApplyTime()));
formmain_1209.put("鍑哄樊浜�-浣滃簾", "");
- formmain_1209.put("鎶ラ攢浜�", serviceReimbursementShared.getUsername());
- formmain_1209.put("鍖哄煙缁勯暱", getLastApprovalInfo(serviceFundflows, serviceReimbursementShared.getManagername()));
- formmain_1209.put("鍑哄樊浜嬬敱", serviceReimbursementShared.getReason());
+ formmain_1209.put("鎶ラ攢浜�", serviceReimbursement.getUsername());
+ formmain_1209.put("鍖哄煙缁勯暱", getLastApprovalInfo(serviceFundflows, serviceReimbursement.getManagername()));
+ formmain_1209.put("鍑哄樊浜嬬敱", serviceReimbursement.getReason());
formmain_1209.put("澶╂暟鍚堣", 0.00);
- formmain_1209.put("浜ら�氳垂鍚堣", serviceReimbursementShared.getTotalamount());
+ formmain_1209.put("浜ら�氳垂鍚堣", serviceReimbursement.getTotalamount());
formmain_1209.put("甯傚唴浜ら�氬悎璁�", 0.00);
formmain_1209.put("浣忓璐瑰悎璁�", 0.00);
formmain_1209.put("鏉傝垂鍚堣", 0.00);
formmain_1209.put("浼欓璐规姤閿�鍚堣", 0.00);
formmain_1209.put("浼欓璐硅ˉ鍔╁悎璁�", 0.00);
formmain_1209.put("鍏朵粬璐圭敤鍚堣", 0.00);
- formmain_1209.put("棰嗘閲戦澶у啓", serviceReimbursementShared.getBigstrmoney());
- formmain_1209.put("棰嗘閲戦", serviceReimbursementShared.getAmountrequested());
+ formmain_1209.put("棰嗘閲戦澶у啓", serviceReimbursement.getBigstrmoney());
+ formmain_1209.put("棰嗘閲戦", serviceReimbursement.getAmountrequested());
formmain_1209.put("璐㈠姟瀹℃壒", "");
- formmain_1209.put("璐㈠姟閮ㄨ礋璐ｄ汉瀹℃壒", getLastApprovalInfo(serviceFundflows, serviceReimbursementShared.getFinancedirector()));
- formmain_1209.put("鍔炲叕瀹や富浠诲鎵�", getLastApprovalInfo(serviceFundflows, serviceReimbursementShared.getOfficedirector()));
- formmain_1209.put("澶囨敞", serviceReimbursementShared.getRemark());
- formmain_1209.put("涓氬姟鍓櫌闀垮鎵�", serviceReimbursementShared.getBusvicepresident());
- formmain_1209.put("璐㈠姟鍓櫌闀垮鎵�", serviceReimbursementShared.getFinvicepresident());
- formmain_1209.put("涓績璐熻矗浜哄鎵�", serviceReimbursementShared.getOpochecker());
+ 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("澶囨敞", serviceReimbursement.getRemark());
+ formmain_1209.put("涓氬姟鍓櫌闀垮鎵�", serviceReimbursement.getBusvicepresident());
+ formmain_1209.put("璐㈠姟鍓櫌闀垮鎵�", serviceReimbursement.getFinvicepresident());
+ formmain_1209.put("涓績璐熻矗浜哄鎵�", serviceReimbursement.getOpochecker());
formmain_1209.put("寮�鎴烽摱琛�-浣滃簾", "");
formmain_1209.put("鍗″彿-浣滃簾", "");
- formmain_1209.put("鏀粯鏂瑰紡", serviceReimbursementShared.getZffs());
- formmain_1209.put("缁勯暱", serviceReimbursementShared.getManagername());
- formmain_1209.put("瀹℃壒浜哄憳", getLastApprovalInfo(serviceFundflows, serviceReimbursementShared.getFinancechecher()));
- formmain_1209.put("鏀粯鏃ユ湡", serviceReimbursementShared.getRiqi());
+ formmain_1209.put("鏀粯鏂瑰紡", serviceReimbursement.getZffs());
+ formmain_1209.put("缁勯暱", getLastApprovalInfo(serviceFundflows, serviceReimbursement.getManagername()));
+ formmain_1209.put("瀹℃壒浜哄憳", getLastApprovalInfo(serviceFundflows, "闄堟厱鍗�"));
+ formmain_1209.put("鏀粯鏃ユ湡", serviceReimbursement.getRiqi());
formmain_1209.put("涓婁紶闄勪欢", "");
formmain_1209.put("鎵撴鍚堣", 0.00);
formmain_1209.put("鍙戠エ璇嗗埆-浣滃簾", "");
formmain_1209.put("璇嗗埆浜�-浣滃簾", "");
formmain_1209.put("璐㈠姟瀹℃壒绛惧瓧", "");
- formmain_1209.put("璐㈠姟閮ㄨ礋璐ｄ汉瀹℃壒绛惧瓧", getLastApprovalInfo(serviceFundflows, serviceReimbursementShared.getFinancedirector()));
+ formmain_1209.put("璐㈠姟閮ㄨ礋璐ｄ汉瀹℃壒绛惧瓧", getLastApprovalInfo(serviceFundflows, serviceReimbursement.getFinancedirector()));
formmain_1209.put("琛ㄥ崟缂栧彿1", "");
formmain_1209.put("CIF璐﹀閰嶇疆1", "");
formmain_1209.put("闄㈠尯", "");
@@ -794,13 +796,13 @@
formmain_1209.put("琛ㄥ崟闄勪欢", "");
formmain_1209.put("10204", "");
formmain_1209.put("鐜伴噾娴侀噺鍒嗘瀽", "");
- formmain_1209.put("鎹愮尞鑰�", serviceReimbursementShared.getDonorname());
+ formmain_1209.put("鎹愮尞鑰�", serviceReimbursement.getDonorname());
formmain_1209.put("鍑瘉绫诲埆", "");
formmain_1209.put("鍚堣", 0.00);
formmain_1209.put("瀹為檯鍚堣", 0.00);
formmain_1209.put("浼欓琛ュ姪鍚堣", 0.00);
formmain_1209.put("鍘嗗彶瀹℃壒璁板綍", "");
- formmain_1209.put("琛ㄥ崟缂栧彿", serviceReimbursementShared.getReimid());
+ formmain_1209.put("琛ㄥ崟缂栧彿", serviceReimbursement.getId());
formmain_1209.put("鍘嗗彶瀹℃壒宸ㄩ箍鏌ヨ", "");
return formmain_1209;
}
@@ -846,6 +848,7 @@
System.out.println("uploadOAFileAndUpdateDb + jsonObject" + jsonObj.toString() + "\r\n" + jsonObj.toJSONString());
String strRes = HttpClientKit.postOpr(strUrl, jsonObj.toString());
+ log.info("-----------------strRes-----鐨勫�间负锛歿}", strRes);
return strRes;
}
--
Gitblit v1.9.3