From 3165f71939bf0783787fbe19ac77063c23ec22bc Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 12 九月 2025 15:01:55 +0800
Subject: [PATCH] 通过生日算年龄
---
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonateannexServiceImpl.java | 21 ++++++++++++++++++---
1 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonateannexServiceImpl.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonateannexServiceImpl.java
index c475520..a2e6438 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonateannexServiceImpl.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonateannexServiceImpl.java
@@ -1,5 +1,7 @@
package com.ruoyi.project.service.impl;
+import java.time.LocalDate;
+import java.time.ZoneId;
import java.util.List;
import com.ruoyi.common.core.domain.entity.SysRole;
@@ -7,7 +9,9 @@
import com.ruoyi.common.exception.base.BaseException;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.project.common.CalculateDateUtils;
import com.ruoyi.project.domain.vo.DonateAnnexVO;
+import com.ruoyi.project.domain.vo.EthicalReviewVO;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -94,12 +98,23 @@
if (b) {
donateAnnexVO.setCreate_by(user.getUserName());
}
- return serviceDonateannexMapper.selectVOList(donateAnnexVO);
+ List<DonateAnnexVO> donateAnnexVOS = serviceDonateannexMapper.selectVOList(donateAnnexVO);
+ for (DonateAnnexVO donateAnnexVO1 : donateAnnexVOS) {
+ if (donateAnnexVO1.getBirthday() != null) {
+ Map<String, String> map = CalculateDateUtils.calculateAge(donateAnnexVO1.getBirthday().toInstant().atZone(ZoneId.systemDefault()).toLocalDate(), LocalDate.now());
+ donateAnnexVO1.setAge(org.apache.commons.lang3.ObjectUtils.isNotEmpty(map.get("age")) ? Long.valueOf(map.get("age")) : null);
+ donateAnnexVO1.setAgeunit(map.get("ageUnit"));
+ donateAnnexVO1.setAge2(org.apache.commons.lang3.ObjectUtils.isNotEmpty(map.get("age2")) ? Long.valueOf(map.get("age2")) : null);
+ donateAnnexVO1.setAgeunit2(map.get("ageUnit2"));
+ }
+ }
+
+ return donateAnnexVOS;
}
@Override
@Transactional(rollbackFor = Exception.class)
- public Boolean saveData(List<ServiceDonateannex> serviceDonateannexs) {
+ public List<ServiceDonateannex> saveData(List<ServiceDonateannex> serviceDonateannexs) {
for (ServiceDonateannex serviceDonateannex : serviceDonateannexs) {
log.info("serviceDonateannex鐨勪俊鎭細{}", serviceDonateannex);
if (serviceDonateannex.getInfoid() == null || serviceDonateannex.getAnnexfilestype() == null) {
@@ -107,7 +122,7 @@
}
this.save(serviceDonateannex);
}
- return true;
+ return serviceDonateannexs;
}
}
--
Gitblit v1.9.3