From d91dfa2b823f6644f1e58dd4770f57e0d0cef08f Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 20 三月 2024 17:51:39 +0800
Subject: [PATCH] 代码提交

---
 ruoyi-project/src/main/resources/mapper/project/ServiceRelativesconfirmationMapper.xml |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceRelativesconfirmationMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceRelativesconfirmationMapper.xml
index 97ba9f1..0211b64 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceRelativesconfirmationMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceRelativesconfirmationMapper.xml
@@ -104,6 +104,8 @@
         `service_donatebaseinfo`.`TreatmentHospitalName` AS `TreatmentHospitalName`,
         `service_donatebaseinfo`.`TreatmentDeptName` AS `TreatmentDeptName`,
         `service_donatebaseinfo`.`create_by` AS `basecreateby`,
+        `service_donatebaseinfo`.`workflow` AS `workflow`,
+        `service_donatebaseinfo`.`termination_case` AS `terminationCase`,
         `service_relativesconfirmation`.`ID` AS `rcID`,
         `service_relativesconfirmation`.`InfoID` AS `InfoID`,
         `service_relativesconfirmation`.`DonorNo` AS `rcDonroNo`,
@@ -143,8 +145,8 @@
         `service_relativesconfirmation`.`create_by` AS `createBy`,
         `service_relativesconfirmation`.`create_time` AS `createTime`,
         `service_relativesconfirmation`.`update_by` AS `updateBy`,
-        `service_relativesconfirmation`.`update_time` AS `updateTime`
-        `service_relativesconfirmation`.`operatorno` AS `operatorno`
+        `service_relativesconfirmation`.`update_time` AS `updateTime`,
+        `service_relativesconfirmation`.`operatorno` AS `operatorno`,
         `service_relativesconfirmation`.`operatorname` AS `operatorname`
     FROM
 
@@ -169,6 +171,7 @@
             <if test="residenceprovince != null and residenceprovince != ''"> and `service_relativesconfirmation`.`ResidenceProvince` = #{residenceprovince}</if>
             <if test="residencecity != null and residencecity != ''"> and `service_relativesconfirmation`.`ResidenceCity` = #{residencecity}</if>
             <if test="residencetown != null and residencetown != ''"> and `service_relativesconfirmation`.`ResidenceTown` = #{residencetown}</if>
+            <if test="workflow != null "> and `service_donatebaseinfo`.`workflow` = #{workflow}</if>
 
     </where>
 

--
Gitblit v1.9.3