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 | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 50 insertions(+), 2 deletions(-)
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceDonatecompletioninfoMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceDonatecompletioninfoMapper.xml
index 89798f2..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>
@@ -177,6 +179,52 @@
where CompleteTime >= #{starttime} AND CompleteTime <= #{endtime} AND del_flag=0
</select>
+ <select id="getDonationCompletionBaseInfo" resultType="com.ruoyi.project.domain.dto.DonationCompletionBaseInfoDTO">
+ SELECT
+ sd.treatmenthospitalname AS treatmenthospitalname,
+ sd.treatmenthospitalno AS treatmenthospitalno,
+ sd.DonorNo AS donorno,
+ sd.case_no AS caseNo,
+ sd.extracontent AS extracontent,
+ sd.DonationCategory as donationcategory,
+ sd.NAME AS name,
+ sd.RecordState AS recordstate,
+ sd.Sex AS sex,
+ sd.Age AS age,
+ sd.BloodType AS bloodtype,
+ sd.idcardno AS idcardno,
+ sd.id AS infoid,
+ sdc.ID AS id,
+ sdc.DonorNo AS donorno,
+ sdc.IsBodyDonation AS isbodydonation,
+ sdc.ReceivingUnitName AS receivingunitname,
+ sdc.ReceivingUnit AS receivingunit,
+ sdc.CompleteTime AS completetime,
+ sdc.ResponsibleUserID AS responsibleuserid,
+ sdc.ResponsibleUserName AS responsibleusername,
+ sdc.CoordinatedUserIDO AS coordinateduserido,
+ sdc.CoordinatedUserNameO AS coordinatedusernameo,
+ sdc.CoordinatedUserIDT AS coordinateduseridt,
+ sdc.CoordinatedUserNameT AS coordinatedusernamet,
+ sdc.AssessAnnex AS assessannex,
+ sdc.DonateOrgan AS donateorgan,
+ sdc.complete_state as completeState
+ FROM
+ service_donatebaseinfo sd
+ LEFT JOIN service_donatecompletioninfo sdc ON sd.ID = sdc.InfoID
+ AND sd.del_flag = 0
+ AND sdc.del_flag = 0
+ and sdc.ID is not null
+ <where>
+ sd.termination_case = 0
+ <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 sd.id = #{infoid}</if>
+ </where>
+ <if test="pageNum != null and pageSize != null">limit #{pageNum},#{pageSize}</if>
+ </select>
+
<update id="delDuplicateDonateCompletioninfo">
update service_donatecompletioninfo
--
Gitblit v1.9.3