From 194ecd2dbc3a9c7eccfe5d9809ff947715960465 Mon Sep 17 00:00:00 2001
From: sinake <sinake1@qq.com>
Date: 星期二, 13 十月 2026 17:32:14 +0800
Subject: [PATCH] 上传命名规则调整
---
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatebaseinfoServiceImpl.java | 42 +++++++++++++++++++++++++++---------------
1 files changed, 27 insertions(+), 15 deletions(-)
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatebaseinfoServiceImpl.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatebaseinfoServiceImpl.java
index cd42b9f..a89a649 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatebaseinfoServiceImpl.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatebaseinfoServiceImpl.java
@@ -236,6 +236,23 @@
serviceDonatebaseinfo.setDeptid(user.getDeptId());
}
List<ServiceDonatebaseinfo> serviceDonatebaseinfos = serviceDonatebaseinfoMapper.selectServiceDonatebaseinfoList(serviceDonatebaseinfo);
+
+ // 涓�娆℃�у彇鍑哄悇鎹愮尞鍩虹瀵瑰簲鐨勬浜℃椂闂达紝閬垮厤鍦ㄥ惊鐜噷鎸� InfoID 閫愭潯鏌ヨ璇佽〃锛圢+1锛�
+ List<Long> infoIds = new ArrayList<>();
+ for (ServiceDonatebaseinfo item : serviceDonatebaseinfos) {
+ if (item.getId() != null) {
+ infoIds.add(item.getId());
+ }
+ }
+ Map<Long, Date> deathTimeMap = new HashMap<>();
+ if (!infoIds.isEmpty()) {
+ for (ServiceDonationwitness witness : serviceDonationwitnessMapper.selectDeathTimeByInfoIds(infoIds)) {
+ if (witness.getInfoid() != null && !deathTimeMap.containsKey(witness.getInfoid())) {
+ deathTimeMap.put(witness.getInfoid(), witness.getDeathtime());
+ }
+ }
+ }
+
for (ServiceDonatebaseinfo serviceDonatebaseinfo1 : serviceDonatebaseinfos) {
//鍏堢粰涓勾榫勯粯璁ゅ�硷紙鍥犱负age鏄暟瀛楃被鍨嬶紝涓嶈兘鏀炬í鏉狅紝鎵�浠ュ氨鎵�妯墰鏀惧埌鍗曚綅涓婏級
serviceDonatebaseinfo1.setAgeunit("-");
@@ -243,22 +260,17 @@
serviceDonatebaseinfo1.setAge2(null);
//鑾峰彇姝讳骸鏃堕棿锛屽鏋滆幏鍙栬璇侀噷鏈夋浜℃椂闂达紝鍒欒繘琛岃绠椾粬鐨勫勾榫�
- ServiceDonationwitness sdw = new ServiceDonationwitness();
- sdw.setInfoid(serviceDonatebaseinfo1.getId());
- List<ServiceDonationwitness> serviceDonationwitnessList = serviceDonationwitnessMapper.selectServiceDonationwitnessList(sdw);
- if (!CollectionUtils.isEmpty(serviceDonationwitnessList) && serviceDonatebaseinfo1.getBirthday() != null) {
- Date deathtime = serviceDonationwitnessList.get(0).getDeathtime();
- if (ObjectUtils.isNotEmpty(deathtime)) {
- Map<String, String> map = CalculateDateUtils.calculateAge(serviceDonatebaseinfo1.getBirthday().toInstant().atZone(ZoneId.systemDefault()).toLocalDate(), deathtime.toInstant().atZone(ZoneId.systemDefault()).toLocalDate());
- if (Objects.isNull(map)) {
- log.error("ServiceDonationwitness鍑虹敓鏃ユ湡锛歿},ServiceDonationwitness姝讳骸鏃ユ湡锛歿}", serviceDonatebaseinfo1.getBirthday(), deathtime);
- continue;
- }
- serviceDonatebaseinfo1.setAge(org.apache.commons.lang3.ObjectUtils.isNotEmpty(map.get("age")) ? Long.valueOf(map.get("age")) : null);
- serviceDonatebaseinfo1.setAgeunit(map.get("ageUnit"));
- serviceDonatebaseinfo1.setAge2(org.apache.commons.lang3.ObjectUtils.isNotEmpty(map.get("age2")) ? Long.valueOf(map.get("age2")) : null);
- serviceDonatebaseinfo1.setAgeunit2(map.get("ageUnit2"));
+ Date deathtime = deathTimeMap.get(serviceDonatebaseinfo1.getId());
+ if (ObjectUtils.isNotEmpty(deathtime) && serviceDonatebaseinfo1.getBirthday() != null) {
+ Map<String, String> map = CalculateDateUtils.calculateAge(serviceDonatebaseinfo1.getBirthday().toInstant().atZone(ZoneId.systemDefault()).toLocalDate(), deathtime.toInstant().atZone(ZoneId.systemDefault()).toLocalDate());
+ if (Objects.isNull(map)) {
+ log.error("ServiceDonationwitness鍑虹敓鏃ユ湡锛歿},ServiceDonationwitness姝讳骸鏃ユ湡锛歿}", serviceDonatebaseinfo1.getBirthday(), deathtime);
+ continue;
}
+ serviceDonatebaseinfo1.setAge(org.apache.commons.lang3.ObjectUtils.isNotEmpty(map.get("age")) ? Long.valueOf(map.get("age")) : null);
+ serviceDonatebaseinfo1.setAgeunit(map.get("ageUnit"));
+ serviceDonatebaseinfo1.setAge2(org.apache.commons.lang3.ObjectUtils.isNotEmpty(map.get("age2")) ? Long.valueOf(map.get("age2")) : null);
+ serviceDonatebaseinfo1.setAgeunit2(map.get("ageUnit2"));
}
}
--
Gitblit v1.9.3