From 4c141764d64c37c4c27e372cd55d9e861b192c28 Mon Sep 17 00:00:00 2001
From: sinake <sinake1@qq.com>
Date: 星期六, 09 五月 2026 18:06:49 +0800
Subject: [PATCH] 捐献基础增加入院时间,捐献上报基础增加入院时间
---
ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonatebaseinfoReport.java | 6 ++++++
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BaseOnlyValController.java | 2 +-
ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonatebaseinfo.java | 5 ++++-
ruoyi-project/src/main/resources/mapper/project/ServiceDonatebaseinfoReportMapper.xml | 4 +++-
ruoyi-project/src/main/resources/mapper/project/ServiceDonatebaseinfoMapper.xml | 1 +
5 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BaseOnlyValController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BaseOnlyValController.java
index 95ac50e..580a07d 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BaseOnlyValController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BaseOnlyValController.java
@@ -50,7 +50,7 @@
*/
@ApiOperation("鑾峰彇搴忓垪鍙�")
@GetMapping("/getSequence")
- public AjaxResult getSequence( String businessType, String orgId) {
+ public AjaxResult getSequence(String businessType, String orgId) {
return AjaxResult.success(baseOnlyvalueService.getSequence(businessType, orgId));
}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonatebaseinfo.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonatebaseinfo.java
index 7dcc24d..f1e20a2 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonatebaseinfo.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonatebaseinfo.java
@@ -640,5 +640,8 @@
@Excel(name = "鍗忚皟鍛樺鍚�", readConverterExp = "鍗忚皟鍛樺鍚�")
private String coordinatorName;
-
+ @ApiModelProperty("鍏ラ櫌鏃堕棿")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date entryTime;
}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonatebaseinfoReport.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonatebaseinfoReport.java
index 865fc4a..23105d9 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonatebaseinfoReport.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonatebaseinfoReport.java
@@ -13,6 +13,7 @@
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
/**
* 鎹愮尞涓婃姤鍩虹瀵硅薄 service_donatebaseinfo_report
@@ -425,5 +426,10 @@
@Excel(name = "纭鏃堕棿", readConverterExp = "纭鏃堕棿")
private Date confirmTime;
+ @ApiModelProperty("鍏ラ櫌鏃堕棿")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date entryTime;
+
}
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceDonatebaseinfoMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceDonatebaseinfoMapper.xml
index 5d97133..6077521 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceDonatebaseinfoMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceDonatebaseinfoMapper.xml
@@ -96,6 +96,7 @@
<result property="currentHospital" column="current_hospital"/>
<result property="terminationType" column="termination_type"/>
<result property="extracontent" column="extracontent"/>
+ <result property="entryTime" column="entry_time"/>
</resultMap>
<sql id="selectServiceDonatebaseinfoVo">
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceDonatebaseinfoReportMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceDonatebaseinfoReportMapper.xml
index 3b10545..8b08e5d 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceDonatebaseinfoReportMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceDonatebaseinfoReportMapper.xml
@@ -63,6 +63,7 @@
<result property="coordinatorNo" column="coordinator_no"/>
<result property="infoName" column="info_name"/>
<result property="infoNo" column="info_no"/>
+ <result property="entryTime" column="entry_time"/>
</resultMap>
<sql id="selectServiceDonatebaseinfoReportVo">
@@ -123,7 +124,8 @@
user_name,
dept_no,
dept_name,
- is_transport
+ is_transport,
+ entry_time
from service_donatebaseinfo_report
</sql>
--
Gitblit v1.9.3