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/ServiceDonatebaseinfoController.java | 128 ++++++++++++++++++++++++++++++++----------
1 files changed, 96 insertions(+), 32 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 cfb81c0..67a9217 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
@@ -1,5 +1,6 @@
package com.ruoyi.web.controller.project;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.annotation.RepeatSubmit;
import com.ruoyi.common.config.RuoYiConfig;
@@ -13,9 +14,12 @@
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.ServiceDonationwitness;
import com.ruoyi.project.domain.vo.TimeVO;
import com.ruoyi.project.service.IServiceDonatebaseinfoService;
+import com.ruoyi.project.service.IServiceDonationwitnessService;
import com.ruoyi.project.service.IServiceExternalpersonService;
import com.ruoyi.system.mapper.SysDeptMapper;
import freemarker.template.Configuration;
@@ -23,14 +27,16 @@
import freemarker.template.TemplateException;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
import java.io.*;
import java.text.SimpleDateFormat;
+import java.time.LocalDate;
+import java.time.ZoneId;
import java.util.*;
-
-//import javafx.scene.input.DataFormat;
/**
@@ -39,12 +45,16 @@
* @author ruoyi
* @date 2021-11-10
*/
+@Slf4j
@Api("娼滃湪鎹愮尞淇℃伅绠＄悊")
@RestController
@RequestMapping("/project/donatebaseinfo")
public class ServiceDonatebaseinfoController extends BaseController {
@Autowired
private IServiceDonatebaseinfoService serviceDonatebaseinfoService;
+
+ @Autowired
+ private IServiceDonationwitnessService serviceDonationwitnessService;
@Autowired
private IServiceExternalpersonService serviceExternalpersonService;
@@ -67,9 +77,10 @@
* 鏌ヨ鎹愮尞鍩虹鍒楄〃
*/
@ApiOperation("娼滃湪鎹愮尞淇℃伅鍒楄〃")
- //@PreAuthorize("@ss.hasPermi('project:donatebaseinfo:list')")
+ //// @PreAuthorize("@ss.hasPermi('project:donatebaseinfo:list')")
@GetMapping("/list")
public TableDataInfo list(ServiceDonatebaseinfo serviceDonatebaseinfo) {
+ log.info("娼滃湪鎹愮尞淇℃伅鍒楄〃锛歿}", serviceDonatebaseinfo);
startPage();
//List<ServiceDonatebaseinfo> list = serviceDonatebaseinfoService.queryList(serviceDonatebaseinfo);
List<ServiceDonatebaseinfo> list = serviceDonatebaseinfoService.selectServiceDonatebaseinfoList(serviceDonatebaseinfo);
@@ -79,20 +90,21 @@
@ApiOperation("灏忕▼搴忕娼滃湪鎹愮尞淇℃伅鍒楄〃")
@GetMapping("/listForSearch")
public TableDataInfo listForSearch(ServiceDonatebaseinfo serviceDonatebaseinfo) {
+ log.info("灏忕▼搴忕娼滃湪鎹愮尞淇℃伅鍒楄〃锛歿}", serviceDonatebaseinfo);
startPage();
List<ServiceDonatebaseinfo> list = serviceDonatebaseinfoService.listForSearch(serviceDonatebaseinfo);
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) {
+ log.info("瀵煎嚭娼滃湪鎹愮尞淇℃伅鍒楄〃锛歿}", serviceDonatebaseinfo);
List<ServiceDonatebaseinfo> list = serviceDonatebaseinfoService.queryList(serviceDonatebaseinfo);
ExcelUtil<ServiceDonatebaseinfo> util = new ExcelUtil<ServiceDonatebaseinfo>(ServiceDonatebaseinfo.class);
return util.exportExcel(list, "鎹愮尞鍩虹鏁版嵁");
@@ -102,36 +114,70 @@
* 鑾峰彇鎹愮尞鍩虹璇︾粏淇℃伅
*/
@ApiOperation("閫氳繃id鑾峰緱娼滃湪鎹愮尞淇℃伅")
- //@PreAuthorize("@ss.hasPermi('project:donatebaseinfo:query')")
+ //// @PreAuthorize("@ss.hasPermi('project:donatebaseinfo:query')")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id) {
- return AjaxResult.success(serviceDonatebaseinfoService.getById(id));
+ log.info("閫氳繃id鑾峰緱娼滃湪鎹愮尞淇℃伅锛歿}", 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"));
+ }
+
+ serviceDonatebaseinfo.setAgeunit("-");
+ serviceDonatebaseinfo.setAge(null);
+ serviceDonatebaseinfo.setAge2(null);
+
+ //鑾峰彇姝讳骸鏃堕棿锛屽鏋滆幏鍙栬璇侀噷鏈夋浜℃椂闂达紝鍒欒繘琛岃绠椾粬鐨勫勾榫�
+ ServiceDonationwitness sdw = new ServiceDonationwitness();
+ sdw.setInfoid(serviceDonatebaseinfo.getId());
+ List<ServiceDonationwitness> serviceDonationwitnessList = serviceDonationwitnessService.selectServiceDonationwitnessList(sdw);
+ if (!CollectionUtils.isEmpty(serviceDonationwitnessList) && serviceDonatebaseinfo.getBirthday() != null) {
+ Date deathtime = serviceDonationwitnessList.get(0).getDeathtime();
+ if (ObjectUtils.isNotEmpty(deathtime)) {
+ Map<String, String> map = CalculateDateUtils.calculateAge(serviceDonatebaseinfo.getBirthday().toInstant().atZone(ZoneId.systemDefault()).toLocalDate(), deathtime.toInstant().atZone(ZoneId.systemDefault()).toLocalDate());
+ if (Objects.isNull(map)) {
+ log.error("serviceDonatebaseinfo鍑虹敓鏃ユ湡锛歿},serviceDonatebaseinfo姝讳骸鏃ユ湡锛歿}", serviceDonatebaseinfo.getBirthday(), deathtime);
+ }
+ 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);
@@ -140,23 +186,25 @@
return AjaxResult.error("鏂板鏃惰韩浠借瘉" + idcardno + "宸插瓨鍦�,鏃犳硶淇濆瓨!");
}
-
- serviceDonatebaseinfo.setDonorno(bh);
+ // serviceDonatebaseinfo.setDonorno(bh);
serviceDonatebaseinfo.setDeptid(user.getDeptId());
serviceDonatebaseinfo.setDeptname(sysDeptMapper.getDeptNameByDeptId(user.getDeptId()));
-
- return toAjax(serviceDonatebaseinfoService.save(serviceDonatebaseinfo));
+ serviceDonatebaseinfoService.save(serviceDonatebaseinfo);
+ Map<String, Long> map = new HashMap<>();
+ map.put("id", serviceDonatebaseinfo.getId());
+ return AjaxResult.success(map);
}
/**
* 淇敼鎹愮尞鍩虹
*/
@ApiOperation("淇敼娼滃湪鎹愮尞淇℃伅")
- //@PreAuthorize("@ss.hasPermi('project:donatebaseinfo:edit')")
+ //// @PreAuthorize("@ss.hasPermi('project:donatebaseinfo:edit')")
@Log(title = "鎹愮尞鍩虹", businessType = BusinessType.UPDATE)
- @PutMapping
+ @PostMapping("/edit")
@RepeatSubmit
public AjaxResult edit(@RequestBody ServiceDonatebaseinfo serviceDonatebaseinfo) {
+ log.info("淇敼娼滃湪鎹愮尞淇℃伅锛歿}", serviceDonatebaseinfo);
return toAjax(serviceDonatebaseinfoService.updateById(serviceDonatebaseinfo));
}
@@ -164,16 +212,18 @@
* 鍒犻櫎鎹愮尞鍩虹
*/
@ApiOperation("鍒犻櫎娼滃湪鎹愮尞淇℃伅")
- //@PreAuthorize("@ss.hasPermi('project:donatebaseinfo:remove')")
+ //// @PreAuthorize("@ss.hasPermi('project:donatebaseinfo:remove')")
@Log(title = "鎹愮尞鍩虹", businessType = BusinessType.DELETE)
- @DeleteMapping("/{ids}")
+ @GetMapping("/remove/{ids}")
public AjaxResult remove(@PathVariable Long[] ids) {
+ log.info("鍒犻櫎娼滃湪鎹愮尞淇℃伅锛歿}", ids);
return toAjax(serviceDonatebaseinfoService.removeByIds(Arrays.asList(ids)));
}
@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));
}
@@ -181,11 +231,13 @@
@ApiOperation("鑾峰彇鎹愮尞鎶ュ憡浜�")
@GetMapping("/reportName/{usertype}")
public AjaxResult getReportName(@PathVariable("usertype") String usertype) {
+ log.info("鑾峰彇鎹愮尞鎶ュ憡浜猴細{}", usertype);
return AjaxResult.success(serviceExternalpersonService.getReportName(usertype));
}
@GetMapping(value = "/updateS1S2S3S4/{id}")
public AjaxResult updateS1S2S3S4(@PathVariable Long id) {
+ log.info("updateS1S2S3S4鐨勫叆鍙傦細{}", id);
return AjaxResult.success(serviceDonatebaseinfoService.updateS1S2S3S4(id));
}
@@ -195,6 +247,7 @@
@ApiOperation("閫氳繃id涓嬭浇浜轰綋鍣ㄥ畼娼滃湪鎹愮尞鑰呯櫥璁拌〃")
@GetMapping(value = "/download/{id}")
public Map downloadInfo(@PathVariable("id") Long id) throws IOException {
+ log.info("閫氳繃id涓嬭浇浜轰綋鍣ㄥ畼娼滃湪鎹愮尞鑰呯櫥璁拌〃锛歿}", id);
Map dataMap = new HashMap();
getData(dataMap, id);
String filePath = getClass().getResource("/template/").getPath();
@@ -229,6 +282,7 @@
}
Map<String, Object> map = new HashMap<>();
map.put("downloadUrl", "/profile/download/wordtemplate/" + name + ".doc");
+ map.put("downloadName", name + ".doc");
return map;
}
@@ -924,8 +978,18 @@
@ApiOperation("鑾峰彇鐘舵�佽幏鍙栬鏁�")
@GetMapping("/countByRecordState")
public AjaxResult countByRecordState(TimeVO timeVO) {
+ log.info("鑾峰彇鐘舵�佽幏鍙栬鏁帮細{}", timeVO);
return AjaxResult.success(serviceDonatebaseinfoService.countByRecordState(timeVO));
}
+ /**
+ * 鑾峰彇鎹愮尞宸ヤ綔娴�
+ */
+ @ApiOperation("鑾峰彇鎹愮尞宸ヤ綔娴�")
+ @GetMapping(value = "/getWorkFlow/{id}")
+ public AjaxResult getWorkFlow(@PathVariable("id") Long id) {
+ log.info("鑾峰彇鎹愮尞宸ヤ綔娴侊細{}", id);
+ return AjaxResult.success(serviceDonatebaseinfoService.getWorkFlow(id));
+ }
}
--
Gitblit v1.9.3