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 | 48 +++++++++++++++++++++++++++++++-----------------
1 files changed, 31 insertions(+), 17 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 67a9217..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
@@ -60,9 +60,6 @@
private IServiceExternalpersonService serviceExternalpersonService;
@Autowired
- private ServerConfig serverConfig;
-
- @Autowired
private SysDeptMapper sysDeptMapper;
@@ -82,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);
}
@@ -165,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);
@@ -886,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("瀹跺睘")) {
@@ -973,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