From 6e5ede0a8052cfa4aae584a3c87f974efa84d4f2 Mon Sep 17 00:00:00 2001
From: sinake <sinake1@qq.com>
Date: 星期五, 08 五月 2026 16:02:37 +0800
Subject: [PATCH] 捐献完成表增加完成状态
---
ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/ServiceDonatecompletioninfoVO.java | 7 +++++++
ruoyi-project/src/main/resources/mapper/project/ServiceDonatecompletioninfoMapper.xml | 9 ++++++---
ruoyi-project/src/main/java/com/ruoyi/project/domain/dto/DonationCompletionBaseInfoDTO.java | 7 +++++++
ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonatecompletioninfo.java | 7 ++++++-
4 files changed, 26 insertions(+), 4 deletions(-)
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonatecompletioninfo.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonatecompletioninfo.java
index 2aebf24..5af0226 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonatecompletioninfo.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonatecompletioninfo.java
@@ -128,6 +128,11 @@
@Excel(name = "鎹愮尞鍣ㄥ畼")
private String donateorgan;
-
+ /**
+ * 瀹屾垚鐘舵��1寰呭埄鐢紝2杩涜涓紝3鎹愮尞瀹屾垚锛�4鏀惧純
+ */
+ @ApiModelProperty("瀹屾垚鐘舵��1寰呭埄鐢紝2杩涜涓紝3鎹愮尞瀹屾垚锛�4鏀惧純")
+ @Excel(name = "瀹屾垚鐘舵��1寰呭埄鐢紝2杩涜涓紝3鎹愮尞瀹屾垚锛�4鏀惧純")
+ private String completeState;
}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/dto/DonationCompletionBaseInfoDTO.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/dto/DonationCompletionBaseInfoDTO.java
index 990b836..9528af4 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/dto/DonationCompletionBaseInfoDTO.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/dto/DonationCompletionBaseInfoDTO.java
@@ -208,4 +208,11 @@
@ApiModelProperty("鎹愮尞鍣ㄥ畼绉绘璇︽儏")
private List<ServiceDonatecomporgan> serviceDonatecomporganList;
+ /**
+ * 瀹屾垚鐘舵��1寰呭埄鐢紝2杩涜涓紝3鎹愮尞瀹屾垚锛�4鏀惧純
+ */
+ @ApiModelProperty("瀹屾垚鐘舵��1寰呭埄鐢紝2杩涜涓紝3鎹愮尞瀹屾垚锛�4鏀惧純")
+ @Excel(name = "瀹屾垚鐘舵��1寰呭埄鐢紝2杩涜涓紝3鎹愮尞瀹屾垚锛�4鏀惧純")
+ private String completeState;
+
}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/ServiceDonatecompletioninfoVO.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/ServiceDonatecompletioninfoVO.java
index 47c905f..6e09c48 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/ServiceDonatecompletioninfoVO.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/ServiceDonatecompletioninfoVO.java
@@ -132,5 +132,12 @@
@ApiModelProperty("鎹愮尞鍣ㄥ畼绉绘琛�")
private List<ServiceDonatecomporgan> serviceDonatecomporganList;
+ /**
+ * 瀹屾垚鐘舵��1寰呭埄鐢紝2杩涜涓紝3鎹愮尞瀹屾垚锛�4鏀惧純
+ */
+ @ApiModelProperty("瀹屾垚鐘舵��1寰呭埄鐢紝2杩涜涓紝3鎹愮尞瀹屾垚锛�4鏀惧純")
+ @Excel(name = "瀹屾垚鐘舵��1寰呭埄鐢紝2杩涜涓紝3鎹愮尞瀹屾垚锛�4鏀惧純")
+ private String completeState;
+
}
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceDonatecompletioninfoMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceDonatecompletioninfoMapper.xml
index 8b758d0..5ae8d56 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceDonatecompletioninfoMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceDonatecompletioninfoMapper.xml
@@ -8,7 +8,7 @@
<result property="id" column="ID"/>
<result property="infoid" column="InfoID"/>
<result property="donorno" column="DonorNo"/>
- <result property="del_flag" column="del_flag"/>
+ <result property="delFlag" column="del_flag"/>
<result property="createBy" column="create_by"/>
<result property="createTime" column="create_time"/>
<result property="updateBy" column="update_by"/>
@@ -25,6 +25,7 @@
<result property="coordinatedusernamet" column="CoordinatedUserNameT"/>
<result property="assessannex" column="AssessAnnex"/>
<result property="donateorgan" column="DonateOrgan"/>
+ <result property="completeState" column="complete_state"/>
</resultMap>
<sql id="selectServiceDonatecompletioninfoVo">
@@ -47,7 +48,8 @@
CoordinatedUserIDT,
CoordinatedUserNameT,
AssessAnnex,
- DonateOrgan
+ DonateOrgan,
+ complete_state
from service_donatecompletioninfo
</sql>
@@ -205,7 +207,8 @@
sdc.CoordinatedUserIDT AS coordinateduseridt,
sdc.CoordinatedUserNameT AS coordinatedusernamet,
sdc.AssessAnnex AS assessannex,
- sdc.DonateOrgan AS donateorgan
+ sdc.DonateOrgan AS donateorgan,
+ sdc.complete_state as completeState
FROM
service_donatebaseinfo sd
LEFT JOIN service_donatecompletioninfo sdc ON sd.ID = sdc.InfoID
--
Gitblit v1.9.3