From 8a8a94d9a6de7d1d1a5720ce1f36d7b5bc6d7702 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 19 十二月 2025 20:13:16 +0800
Subject: [PATCH] 代码提交
---
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatebaseinfoServiceImpl.java | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 50 insertions(+), 6 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 0f4e8a5..cd42b9f 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
@@ -237,14 +237,58 @@
}
List<ServiceDonatebaseinfo> serviceDonatebaseinfos = serviceDonatebaseinfoMapper.selectServiceDonatebaseinfoList(serviceDonatebaseinfo);
for (ServiceDonatebaseinfo serviceDonatebaseinfo1 : serviceDonatebaseinfos) {
- if (serviceDonatebaseinfo1.getBirthday() != null) {
- Map<String, String> map = CalculateDateUtils.calculateAge(serviceDonatebaseinfo1.getBirthday().toInstant().atZone(ZoneId.systemDefault()).toLocalDate(), LocalDate.now());
- 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"));
+ //鍏堢粰涓勾榫勯粯璁ゅ�硷紙鍥犱负age鏄暟瀛楃被鍨嬶紝涓嶈兘鏀炬í鏉狅紝鎵�浠ュ氨鎵�妯墰鏀惧埌鍗曚綅涓婏級
+ serviceDonatebaseinfo1.setAgeunit("-");
+ serviceDonatebaseinfo1.setAge(null);
+ 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"));
+ }
+ }
+
+ }
+
+ return serviceDonatebaseinfos;
+ }
+
+ @Override
+ public List<ServiceDonatebaseinfo> getPatName(ServiceDonatebaseinfo serviceDonatebaseinfo) {
+
+ SysUser user = SecurityUtils.getLoginUser().getUser();
+ List<SysRole> l = user.getRoles();
+ int b = 0;
+
+ for (SysRole r : l) {
+ if (r.getRoleId().longValue() == 3) {
+ b = 1;
+ }
+ if (r.getRoleId().longValue() == 13) {
+ b = 2;
}
}
+ if (b == 1) {
+ log.info("user.getUserName()鐨勫�间负 ---- 锛歿}", user.getUserName());
+ serviceDonatebaseinfo.setReporterno(user.getUserName());
+ }
+ if (b == 2) {
+ serviceDonatebaseinfo.setDeptid(user.getDeptId());
+ }
+ List<ServiceDonatebaseinfo> serviceDonatebaseinfos = serviceDonatebaseinfoMapper.getPatName(serviceDonatebaseinfo);
return serviceDonatebaseinfos;
}
--
Gitblit v1.9.3