From 533ffe54ffc7f0f39b9df8f7d99fee4880b50952 Mon Sep 17 00:00:00 2001
From: sinake <sinake1@qq.com>
Date: 星期五, 24 四月 2026 09:20:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-project/src/main/resources/mapper/project/ServiceRelativesconfirmationMapper.xml | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceRelativesconfirmationMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceRelativesconfirmationMapper.xml
index 86a1033..70da649 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceRelativesconfirmationMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceRelativesconfirmationMapper.xml
@@ -52,6 +52,8 @@
<result property="occupation" column="occupation"/>
<result property="assessannex" column="assessannex"/>
<result property="relativeRemark" column="relative_remark"/>
+ <result property="relativeconfirmationsignname" column="relativeconfirmationsignname"/>
+ <result property="relativeidcardno" column="relativeidcardno"/>
</resultMap>
<sql id="selectServiceRelativesconfirmationVo">
@@ -303,7 +305,9 @@
sr.occupation as occupation,
sr.relative_remark as relativeRemark,
sr.assessannex as assessannex,
- sr.education as education
+ sr.education as education,
+ sr.relativeconfirmationsignname,
+ sr.relativeidcardno
FROM service_donatebaseinfo sd
LEFT JOIN service_relativesconfirmation sr ON sd.ID = sr.InfoID and sd.del_flag = 0
AND sr.del_flag = 0
@@ -333,6 +337,7 @@
and sr.SignDate <= #{endSigndate}
</if>
</where>
+ order by sr.id desc,sd.id desc
<if test="pageNum != null and pageSize != null">limit #{pageNum},#{pageSize}</if>
</select>
--
Gitblit v1.9.3