From d42096fd55c4b0caf84bb4f208b4e17534e158c1 Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期四, 21 五月 2026 15:34:49 +0800
Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/opo-qd
---
ruoyi-project/src/main/resources/mapper/project/ServiceDonatecompletioninfoMapper.xml | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceDonatecompletioninfoMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceDonatecompletioninfoMapper.xml
index 8b758d0..51fb2f7 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,10 @@
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,
+ sdc.signfamilyrelations,
+ sdc.relationname
FROM
service_donatebaseinfo sd
LEFT JOIN service_donatecompletioninfo sdc ON sd.ID = sdc.InfoID
--
Gitblit v1.9.3