From 8a8a94d9a6de7d1d1a5720ce1f36d7b5bc6d7702 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 19 十二月 2025 20:13:16 +0800
Subject: [PATCH] 代码提交
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatebaseinfoController.java | 77 ++++++++++++++++++++++++++++++--------
1 files changed, 61 insertions(+), 16 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 fb694f1..d4488be 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;
@@ -15,8 +16,10 @@
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;
@@ -26,6 +29,7 @@
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.*;
@@ -50,10 +54,10 @@
private IServiceDonatebaseinfoService serviceDonatebaseinfoService;
@Autowired
- private IServiceExternalpersonService serviceExternalpersonService;
+ private IServiceDonationwitnessService serviceDonationwitnessService;
@Autowired
- private ServerConfig serverConfig;
+ private IServiceExternalpersonService serviceExternalpersonService;
@Autowired
private SysDeptMapper sysDeptMapper;
@@ -75,8 +79,19 @@
public TableDataInfo list(ServiceDonatebaseinfo serviceDonatebaseinfo) {
log.info("娼滃湪鎹愮尞淇℃伅鍒楄〃锛歿}", serviceDonatebaseinfo);
startPage();
- //List<ServiceDonatebaseinfo> list = serviceDonatebaseinfoService.queryList(serviceDonatebaseinfo);
List<ServiceDonatebaseinfo> list = serviceDonatebaseinfoService.selectServiceDonatebaseinfoList(serviceDonatebaseinfo);
+ return getDataTable(list);
+ }
+
+ /**
+ * 鏌ヨ娼滃湪鎹愮尞鎮ｈ�呬俊鎭垪琛ㄤ笉涓巄ase_organization鍏宠仈
+ */
+ @ApiOperation("娼滃湪鎹愮尞鎮ｈ�呬俊鎭垪琛�")
+ //// @PreAuthorize("@ss.hasPermi('project:donatebaseinfo:list')")
+ @GetMapping("/getpatname")
+ public TableDataInfo getPatName(ServiceDonatebaseinfo serviceDonatebaseinfo) {
+ log.info("娼滃湪鎹愮尞鎮ｈ�呬俊鎭垪琛細{}", serviceDonatebaseinfo);
+ List<ServiceDonatebaseinfo> list = serviceDonatebaseinfoService.getPatName(serviceDonatebaseinfo);
return getDataTable(list);
}
@@ -119,6 +134,30 @@
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);
}
@@ -134,19 +173,6 @@
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 idcardno = serviceDonatebaseinfo.getIdcardno();
ServiceDonatebaseinfo serviceDonatebaseinfo2 = new ServiceDonatebaseinfo();
serviceDonatebaseinfo2.setIdcardno(idcardno);
@@ -855,6 +881,11 @@
dataMap.put("YJXZGX", "鍏朵粬");
}
//淇℃伅鏉ユ簮
+ if (serviceDonatebaseinfo.getInfosources().contains("绾㈠崄瀛椾細")) {
+ dataMap.put("HSZH2", (char) 8730); // 鍕鹃�夌鍙�
+ } else {
+ dataMap.put("HSZH2", "鈻�"); // 鏂规绗﹀彿
+ }
if (serviceDonatebaseinfo.getInfosources().contains("鍖荤枟鏈烘瀯")) {
dataMap.put("YLJG", (char) 8730);
if (serviceDonatebaseinfo.getInfosources().contains("瀹跺睘")) {
@@ -942,6 +973,20 @@
dataMap.put("BGR", serviceDonatebaseinfo.getReportername() == null ? "" : serviceDonatebaseinfo.getReportername());
dataMap.put("BGRDH", serviceDonatebaseinfo.getReporterphone() == null ? "" : serviceDonatebaseinfo.getReporterphone());
+ //鑾峰彇鎶ュ憡鏃堕棿
+ String bgrq = null;
+ if (serviceDonatebaseinfo.getReporttime() != null) {
+ Date reportTime = serviceDonatebaseinfo.getReporttime();
+ LocalDate localDate = reportTime.toInstant().atZone(ZoneId.systemDefault()).toLocalDate();
+
+ int year = localDate.getYear();
+ int month = localDate.getMonthValue(); // 鐩存帴鑾峰彇鏈堜唤鍊硷紙1-12锛�
+ int day = localDate.getDayOfMonth();
+ bgrq = year + "骞�" + month + "鏈�" + day + "鏃�";
+ }
+
+ dataMap.put("BGRQ", bgrq);
+
}
@ApiOperation("鑾峰彇鐘舵�佽幏鍙栬鏁�")
--
Gitblit v1.9.3