From 3165f71939bf0783787fbe19ac77063c23ec22bc Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 12 九月 2025 15:01:55 +0800
Subject: [PATCH] 通过生日算年龄
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatebaseinfoController.java | 63 ++++++++++++++++++-------------
1 files changed, 36 insertions(+), 27 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatebaseinfoController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatebaseinfoController.java
index 3ec5767..fb694f1 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatebaseinfoController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatebaseinfoController.java
@@ -13,6 +13,7 @@
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.config.ServerConfig;
+import com.ruoyi.project.common.CalculateDateUtils;
import com.ruoyi.project.domain.ServiceDonatebaseinfo;
import com.ruoyi.project.domain.vo.TimeVO;
import com.ruoyi.project.service.IServiceDonatebaseinfoService;
@@ -29,9 +30,9 @@
import java.io.*;
import java.text.SimpleDateFormat;
+import java.time.LocalDate;
+import java.time.ZoneId;
import java.util.*;
-
-//import javafx.scene.input.DataFormat;
/**
@@ -69,7 +70,7 @@
* 鏌ヨ鎹愮尞鍩虹鍒楄〃
*/
@ApiOperation("娼滃湪鎹愮尞淇℃伅鍒楄〃")
- //@PreAuthorize("@ss.hasPermi('project:donatebaseinfo:list')")
+ //// @PreAuthorize("@ss.hasPermi('project:donatebaseinfo:list')")
@GetMapping("/list")
public TableDataInfo list(ServiceDonatebaseinfo serviceDonatebaseinfo) {
log.info("娼滃湪鎹愮尞淇℃伅鍒楄〃锛歿}", serviceDonatebaseinfo);
@@ -88,12 +89,11 @@
return getDataTable(list);
}
-
/**
* 瀵煎嚭鎹愮尞鍩虹鍒楄〃
*/
@ApiOperation("瀵煎嚭娼滃湪鎹愮尞淇℃伅鍒楄〃")
- //@PreAuthorize("@ss.hasPermi('project:donatebaseinfo:export')")
+ //// @PreAuthorize("@ss.hasPermi('project:donatebaseinfo:export')")
@Log(title = "鎹愮尞鍩虹", businessType = BusinessType.EXPORT)
@GetMapping("/export")
public AjaxResult export(ServiceDonatebaseinfo serviceDonatebaseinfo) {
@@ -107,38 +107,46 @@
* 鑾峰彇鎹愮尞鍩虹璇︾粏淇℃伅
*/
@ApiOperation("閫氳繃id鑾峰緱娼滃湪鎹愮尞淇℃伅")
- //@PreAuthorize("@ss.hasPermi('project:donatebaseinfo:query')")
+ //// @PreAuthorize("@ss.hasPermi('project:donatebaseinfo:query')")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id) {
log.info("閫氳繃id鑾峰緱娼滃湪鎹愮尞淇℃伅锛歿}", id);
- return AjaxResult.success(serviceDonatebaseinfoService.getById(id));
+ ServiceDonatebaseinfo serviceDonatebaseinfo = serviceDonatebaseinfoService.getById(id);
+ if (serviceDonatebaseinfo.getBirthday() != null) {
+ Map<String, String> map = CalculateDateUtils.calculateAge(serviceDonatebaseinfo.getBirthday().toInstant().atZone(ZoneId.systemDefault()).toLocalDate(), LocalDate.now());
+ serviceDonatebaseinfo.setAge(org.apache.commons.lang3.ObjectUtils.isNotEmpty(map.get("age")) ? Long.valueOf(map.get("age")) : null);
+ serviceDonatebaseinfo.setAgeunit(map.get("ageUnit"));
+ serviceDonatebaseinfo.setAge2(org.apache.commons.lang3.ObjectUtils.isNotEmpty(map.get("age2")) ? Long.valueOf(map.get("age2")) : null);
+ serviceDonatebaseinfo.setAgeunit2(map.get("ageUnit2"));
+ }
+ return AjaxResult.success(serviceDonatebaseinfo);
}
/**
* 鏂板鎹愮尞鍩虹
*/
@ApiOperation("鏂板娼滃湪鎹愮尞淇℃伅")
- //@PreAuthorize("@ss.hasPermi('project:donatebaseinfo:add')")
+ //// @PreAuthorize("@ss.hasPermi('project:donatebaseinfo:add')")
@Log(title = "鎹愮尞鍩虹", businessType = BusinessType.INSERT)
- @PostMapping
+ @PostMapping("/add")
@RepeatSubmit
public AjaxResult add(@RequestBody ServiceDonatebaseinfo serviceDonatebaseinfo) {
log.info("鏂板娼滃湪鎹愮尞淇℃伅锛歿}", serviceDonatebaseinfo);
SysUser user = SecurityUtils.getLoginUser().getUser();
- String bh = "";
- bh = serviceDonatebaseinfoService.getDonateNumber(serviceDonatebaseinfo);
- if (bh == "") {
- return AjaxResult.error("鏂板鏃剁敓鎴愮殑缂栧彿涓虹┖,鍒涘缓澶辫触!");
- } else {
- ServiceDonatebaseinfo serviceDonatebaseinfo1 = new ServiceDonatebaseinfo();
- serviceDonatebaseinfo1.setDonorno(bh);
- List<ServiceDonatebaseinfo> listrecord = serviceDonatebaseinfoService.queryList(serviceDonatebaseinfo1);
- if (listrecord.size() > 0) {
- return AjaxResult.error("鏂板鏃剁敓鎴愮殑缂栧彿" + bh + "宸插瓨鍦�,鏃犳硶淇濆瓨!");
- }
-
- }
+// String bh = "";
+// bh = serviceDonatebaseinfoService.getDonateNumber(serviceDonatebaseinfo);
+// if (bh == "") {
+// return AjaxResult.error("鏂板鏃剁敓鎴愮殑缂栧彿涓虹┖,鍒涘缓澶辫触!");
+// } else {
+// ServiceDonatebaseinfo serviceDonatebaseinfo1 = new ServiceDonatebaseinfo();
+// serviceDonatebaseinfo1.setDonorno(bh);
+// List<ServiceDonatebaseinfo> listrecord = serviceDonatebaseinfoService.queryList(serviceDonatebaseinfo1);
+// if (listrecord.size() > 0) {
+// return AjaxResult.error("鏂板鏃剁敓鎴愮殑缂栧彿" + bh + "宸插瓨鍦�,鏃犳硶淇濆瓨!");
+// }
+//
+// }
String idcardno = serviceDonatebaseinfo.getIdcardno();
ServiceDonatebaseinfo serviceDonatebaseinfo2 = new ServiceDonatebaseinfo();
serviceDonatebaseinfo2.setIdcardno(idcardno);
@@ -147,7 +155,7 @@
return AjaxResult.error("鏂板鏃惰韩浠借瘉" + idcardno + "宸插瓨鍦�,鏃犳硶淇濆瓨!");
}
- serviceDonatebaseinfo.setDonorno(bh);
+ // serviceDonatebaseinfo.setDonorno(bh);
serviceDonatebaseinfo.setDeptid(user.getDeptId());
serviceDonatebaseinfo.setDeptname(sysDeptMapper.getDeptNameByDeptId(user.getDeptId()));
serviceDonatebaseinfoService.save(serviceDonatebaseinfo);
@@ -160,7 +168,7 @@
* 淇敼鎹愮尞鍩虹
*/
@ApiOperation("淇敼娼滃湪鎹愮尞淇℃伅")
- //@PreAuthorize("@ss.hasPermi('project:donatebaseinfo:edit')")
+ //// @PreAuthorize("@ss.hasPermi('project:donatebaseinfo:edit')")
@Log(title = "鎹愮尞鍩虹", businessType = BusinessType.UPDATE)
@PostMapping("/edit")
@RepeatSubmit
@@ -173,7 +181,7 @@
* 鍒犻櫎鎹愮尞鍩虹
*/
@ApiOperation("鍒犻櫎娼滃湪鎹愮尞淇℃伅")
- //@PreAuthorize("@ss.hasPermi('project:donatebaseinfo:remove')")
+ //// @PreAuthorize("@ss.hasPermi('project:donatebaseinfo:remove')")
@Log(title = "鎹愮尞鍩虹", businessType = BusinessType.DELETE)
@GetMapping("/remove/{ids}")
public AjaxResult remove(@PathVariable Long[] ids) {
@@ -182,8 +190,8 @@
}
@ApiOperation("鑾峰彇鎹愮尞缂栧彿")
- @GetMapping("/donatenumber")
- public AjaxResult getDonateNumber(ServiceDonatebaseinfo serviceDonatebaseinfo) {
+ @PostMapping("/donatenumber")
+ public AjaxResult getDonateNumber(@RequestBody ServiceDonatebaseinfo serviceDonatebaseinfo) {
log.info("鑾峰彇鎹愮尞缂栧彿锛歿}", serviceDonatebaseinfo);
return AjaxResult.success(serviceDonatebaseinfoService.getDonateNumber(serviceDonatebaseinfo));
}
@@ -243,6 +251,7 @@
}
Map<String, Object> map = new HashMap<>();
map.put("downloadUrl", "/profile/download/wordtemplate/" + name + ".doc");
+ map.put("downloadName", name + ".doc");
return map;
}
--
Gitblit v1.9.3