From 1574cc259ecec7217d210c58d2bbf7b44a106234 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 12 九月 2025 20:48:31 +0800
Subject: [PATCH] 通过生日算年龄
---
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceReimbursementServiceImpl.java | 17 +++++++----------
1 files changed, 7 insertions(+), 10 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..33f2c24 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);
@@ -394,7 +395,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 {
@@ -526,14 +528,12 @@
return "瀹℃壒浜猴細" + managerName + " & 瀹℃壒鏃堕棿锛�" + sd.format(new Date()) + " & 瀹℃壒缁撴灉锛氶�氳繃";
}
- Optional<ServiceFundflow> lastApproval = serviceFundflows.stream()
- .filter(flow -> flow.getCheckusername().contains(managerName))
- .max(Comparator.comparing(ServiceFundflow::getCheckTime));
+ Optional<ServiceFundflow> lastApproval = serviceFundflows.stream().filter(flow -> flow.getCheckusername().contains(managerName)).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());
@@ -572,13 +572,11 @@
// 涓昏〃瀛楁鏁版嵁
Map<String, Object> data2 = new HashMap<>();
data2.put("formmain_1209", formmain_1209(serviceReimbursementSharedList.get(0)));
-
// 鏄庣粏琛ㄥ瓧娈垫暟鎹紝涓庨檮浠剁殑澶勭悊
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 +590,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 +597,6 @@
String token = getToken();
JSONObject json1 = JSONObject.parseObject(token);
token = json1.get("id").toString();
-
ObjectMapper objectMapper = new ObjectMapper();
String json = null;
try {
@@ -846,6 +842,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