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/resources/mapper/project/ServiceDonatecompletioninfoMapper.xml |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceDonatecompletioninfoMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceDonatecompletioninfoMapper.xml
index 48ac008..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
@@ -217,7 +220,7 @@
             <if test="name != null  and name != ''">and sd.Name like concat('%', #{name}, '%')</if>
             <if test="inpatientno != null  and inpatientno != ''">and sd.inpatientno = #{inpatientno}</if>
             <if test="donorno != null  and donorno != ''">and sdc.DonorNo = #{donorno}</if>
-            <if test="infoid != null">and sdc.InfoID = #{infoid}</if>
+            <if test="infoid != null">and sd.id = #{infoid}</if>
         </where>
         <if test="pageNum != null and pageSize != null">limit #{pageNum},#{pageSize}</if>
     </select>

--
Gitblit v1.9.3