From b1ffaa0bfbe610b16b64966965fe13b7e2a57d93 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期二, 04 十一月 2025 19:06:30 +0800
Subject: [PATCH] 处理年龄问题
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceMedicalevaluationController.java | 59 +++++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 49 insertions(+), 10 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceMedicalevaluationController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceMedicalevaluationController.java
index 9f8b375..d80dd34 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceMedicalevaluationController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceMedicalevaluationController.java
@@ -1,12 +1,21 @@
package com.ruoyi.web.controller.project;
+import java.time.LocalDate;
+import java.time.ZoneId;
import java.util.Arrays;
+import java.util.Date;
import java.util.List;
+import java.util.Map;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.ruoyi.common.annotation.NotRepeatCommit;
+import com.ruoyi.project.common.CalculateDateUtils;
+import com.ruoyi.project.domain.ServiceDonationwitness;
import com.ruoyi.project.domain.vo.MedicalEvaluationVO;
+import com.ruoyi.project.service.IServiceDonationwitnessService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.CollectionUtils;
@@ -34,6 +43,7 @@
* @author ruoyi
* @date 2021-11-19
*/
+@Slf4j
@Api("鍖荤枟璇勪及绠＄悊")
@RestController
@RequestMapping("/project/medicalevaluation")
@@ -41,11 +51,14 @@
@Autowired
private IServiceMedicalevaluationService serviceMedicalevaluationService;
+ @Autowired
+ private IServiceDonationwitnessService serviceDonationwitnessService;
+
/**
* 鏌ヨ鍖诲璇勪及鍒楄〃
*/
@ApiOperation("鑾峰彇鍖荤枟璇勪及鍒楄〃")
- //@PreAuthorize("@ss.hasPermi('project:medicalevaluation:list')")
+ //// @PreAuthorize("@ss.hasPermi('project:medicalevaluation:list')")
@GetMapping("/list")
public TableDataInfo list(ServiceMedicalevaluation serviceMedicalevaluation) {
startPage();
@@ -58,6 +71,31 @@
public TableDataInfo listnew(MedicalEvaluationVO medicalEvaluationVO) {
startPage();
List<MedicalEvaluationVO> list = serviceMedicalevaluationService.selectVOList(medicalEvaluationVO);
+ for (MedicalEvaluationVO medicalEvaluationVO1 : list) {
+ //鍏堢粰涓勾榫勯粯璁ゅ�硷紙鍥犱负age鏄暟瀛楃被鍨嬶紝涓嶈兘鏀炬í鏉狅紝鎵�浠ュ氨鎵�妯墰鏀惧埌鍗曚綅涓婏級
+ medicalEvaluationVO1.setAgeunit("-");
+ medicalEvaluationVO1.setAge(null);
+ medicalEvaluationVO1.setAge2(null);
+ //鑾峰彇姝讳骸鏃堕棿锛屽鏋滆幏鍙栬璇侀噷鏈夋浜℃椂闂达紝鍒欒繘琛岃绠椾粬鐨勫勾榫�
+ ServiceDonationwitness sdw = new ServiceDonationwitness();
+ sdw.setInfoid(medicalEvaluationVO1.getInfoid());
+ List<ServiceDonationwitness> serviceDonationwitnessList = serviceDonationwitnessService.selectServiceDonationwitnessList(sdw);
+ if (!CollectionUtils.isEmpty(serviceDonationwitnessList) && medicalEvaluationVO1.getBirthday() != null) {
+ Date deathtime = serviceDonationwitnessList.get(0).getDeathtime();
+ if (ObjectUtils.isNotEmpty(deathtime)) {
+ Map<String, String> map = CalculateDateUtils.calculateAge(medicalEvaluationVO1.getBirthday().toInstant().atZone(ZoneId.systemDefault()).toLocalDate(), deathtime.toInstant().atZone(ZoneId.systemDefault()).toLocalDate());
+ if (ObjectUtils.isEmpty(map)) {
+ log.error("MedicalEvaluationVO鍑虹敓鏃ユ湡锛歿},MedicalEvaluationVO姝讳骸鏃ユ湡锛歿}", medicalEvaluationVO1.getBirthday(), deathtime);
+ continue;
+ }
+ medicalEvaluationVO1.setAge(org.apache.commons.lang3.ObjectUtils.isNotEmpty(map.get("age")) ? Long.valueOf(map.get("age")) : null);
+ medicalEvaluationVO1.setAgeunit(map.get("ageUnit"));
+ medicalEvaluationVO1.setAge2(org.apache.commons.lang3.ObjectUtils.isNotEmpty(map.get("age2")) ? Long.valueOf(map.get("age2")) : null);
+ medicalEvaluationVO1.setAgeunit2(map.get("ageUnit2"));
+ }
+ }
+
+ }
return getDataTable(list);
}
@@ -65,7 +103,7 @@
* 瀵煎嚭鍖诲璇勪及鍒楄〃
*/
@ApiOperation("瀵煎嚭鍖荤枟璇勪及鍒楄〃")
- //@PreAuthorize("@ss.hasPermi('project:medicalevaluation:export')")
+ //// @PreAuthorize("@ss.hasPermi('project:medicalevaluation:export')")
@Log(title = "鍖诲璇勪及", businessType = BusinessType.EXPORT)
@GetMapping("/export")
public AjaxResult export(ServiceMedicalevaluation serviceMedicalevaluation) {
@@ -78,7 +116,7 @@
* 鑾峰彇鍖诲璇勪及璇︾粏淇℃伅
*/
@ApiOperation("閫氳繃id鑾峰彇鍖荤枟璇勪及淇℃伅")
- //@PreAuthorize("@ss.hasPermi('project:medicalevaluation:query')")
+ //// @PreAuthorize("@ss.hasPermi('project:medicalevaluation:query')")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id) {
return AjaxResult.success(serviceMedicalevaluationService.getById(id));
@@ -88,22 +126,23 @@
* 鏂板鍖诲璇勪及
*/
@ApiOperation("鏂板鍖诲璇勪及")
- //@PreAuthorize("@ss.hasPermi('project:medicalevaluation:add')")
+ //// @PreAuthorize("@ss.hasPermi('project:medicalevaluation:add')")
@Log(title = "鍖诲璇勪及", businessType = BusinessType.INSERT)
- @PostMapping
- @NotRepeatCommit(key = "param:arg[1]", value = 30000)
+ @PostMapping("/add")
+// @NotRepeatCommit(key = "param:arg[1]", value = 30000)
public AjaxResult add(@RequestBody ServiceMedicalevaluation serviceMedicalevaluation) {
- return toAjax(serviceMedicalevaluationService.save(serviceMedicalevaluation));
+ boolean save = serviceMedicalevaluationService.save(serviceMedicalevaluation);
+ return AjaxResult.success(serviceMedicalevaluation);
}
/**
* 淇敼鍖诲璇勪及
*/
@ApiOperation("淇敼鍖诲璇勪及")
- //@PreAuthorize("@ss.hasPermi('project:medicalevaluation:edit')")
+ //// @PreAuthorize("@ss.hasPermi('project:medicalevaluation:edit')")
@Log(title = "鍖诲璇勪及", businessType = BusinessType.UPDATE)
@PostMapping("/edit")
- @NotRepeatCommit(key = "param:arg[1]", value = 30000)
+// @NotRepeatCommit(key = "param:arg[1]", value = 30000)
public AjaxResult edit(@RequestBody ServiceMedicalevaluation serviceMedicalevaluation) {
List<ServiceMedicalevaluation> list = serviceMedicalevaluationService.queryList(serviceMedicalevaluation);
if (CollectionUtils.isEmpty(list)) {
@@ -117,7 +156,7 @@
* 鍒犻櫎鍖诲璇勪及
*/
@ApiOperation("鍒犻櫎鍖诲璇勪及")
- //@PreAuthorize("@ss.hasPermi('project:medicalevaluation:remove')")
+ //// @PreAuthorize("@ss.hasPermi('project:medicalevaluation:remove')")
@Log(title = "鍖诲璇勪及", businessType = BusinessType.DELETE)
@GetMapping("/remove/{ids}")
public AjaxResult remove(@PathVariable Long[] ids) {
--
Gitblit v1.9.3