From e842ed74b3167075e4f8f0cf76b38ddc53a8fb54 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 12 九月 2025 22:18:48 +0800
Subject: [PATCH] 日志修改

---
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceMedicalevaluationController.java |   29 +++++++++++++++++++++--------
 1 files changed, 21 insertions(+), 8 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 827a1f5..24cbe39 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,9 +1,13 @@
 package com.ruoyi.web.controller.project;
 
+import java.time.LocalDate;
+import java.time.ZoneId;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Map;
 
 import com.ruoyi.common.annotation.NotRepeatCommit;
+import com.ruoyi.project.common.CalculateDateUtils;
 import com.ruoyi.project.domain.vo.MedicalEvaluationVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -45,7 +49,7 @@
      * 鏌ヨ鍖诲璇勪及鍒楄〃
      */
     @ApiOperation("鑾峰彇鍖荤枟璇勪及鍒楄〃")
-    //@PreAuthorize("@ss.hasPermi('project:medicalevaluation:list')")
+    //// @PreAuthorize("@ss.hasPermi('project:medicalevaluation:list')")
     @GetMapping("/list")
     public TableDataInfo list(ServiceMedicalevaluation serviceMedicalevaluation) {
         startPage();
@@ -58,6 +62,15 @@
     public TableDataInfo listnew(MedicalEvaluationVO medicalEvaluationVO) {
         startPage();
         List<MedicalEvaluationVO> list = serviceMedicalevaluationService.selectVOList(medicalEvaluationVO);
+        for (MedicalEvaluationVO medicalEvaluationVO1 : list) {
+            if (medicalEvaluationVO1.getBirthday() != null) {
+                Map<String, String> map = CalculateDateUtils.calculateAge(medicalEvaluationVO1.getBirthday().toInstant().atZone(ZoneId.systemDefault()).toLocalDate(), LocalDate.now());
+                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 +78,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 +91,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,10 +101,10 @@
      * 鏂板鍖诲璇勪及
      */
     @ApiOperation("鏂板鍖诲璇勪及")
-    //@PreAuthorize("@ss.hasPermi('project:medicalevaluation:add')")
+    //// @PreAuthorize("@ss.hasPermi('project:medicalevaluation:add')")
     @Log(title = "鍖诲璇勪及", businessType = BusinessType.INSERT)
     @PostMapping("/add")
-    @NotRepeatCommit(key = "param:arg[1]", value = 30000)
+//    @NotRepeatCommit(key = "param:arg[1]", value = 30000)
     public AjaxResult add(@RequestBody ServiceMedicalevaluation serviceMedicalevaluation) {
         boolean save = serviceMedicalevaluationService.save(serviceMedicalevaluation);
         return AjaxResult.success(serviceMedicalevaluation);
@@ -101,10 +114,10 @@
      * 淇敼鍖诲璇勪及
      */
     @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)) {
@@ -118,7 +131,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