From cda5ded993e1d735cbe8fa76f6f988e89024afe0 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 24 七月 2024 15:59:07 +0800
Subject: [PATCH] 变更

---
 ruoyi-project/src/main/resources/mapper/project/ServiceDonatecompletioninfoMapper.xml |   12 ++++++++----
 1 files changed, 8 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 4ee365e..3ff21a4 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceDonatecompletioninfoMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceDonatecompletioninfoMapper.xml
@@ -3,8 +3,8 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.project.mapper.ServiceDonatecompletioninfoMapper">
-    
-    <resultMap type="ServiceDonatecompletioninfo" id="ServiceDonatecompletioninfoResult">
+
+    <resultMap type="com.ruoyi.project.domain.ServiceDonatecompletioninfo" id="ServiceDonatecompletioninfoResult">
         <result property="id"    column="ID"    />
         <result property="infoid"    column="InfoID"    />
         <result property="donorno"    column="DonorNo"    />
@@ -31,7 +31,7 @@
         select ID, InfoID, DonorNo, del_flag, create_by, create_time, update_by, update_time, IsBodyDonation, ReceivingUnit, ReceivingUnitName, CompleteTime, ResponsibleUserID, ResponsibleUserName, CoordinatedUserIDO, CoordinatedUserNameO, CoordinatedUserIDT, CoordinatedUserNameT, AssessAnnex, DonateOrgan from service_donatecompletioninfo
     </sql>
 
-    <select id="selectServiceDonatecompletioninfoList" parameterType="ServiceDonatecompletioninfo" resultMap="ServiceDonatecompletioninfoResult">
+    <select id="selectServiceDonatecompletioninfoList" parameterType="com.ruoyi.project.domain.ServiceDonatecompletioninfo" resultMap="ServiceDonatecompletioninfoResult">
         <include refid="selectServiceDonatecompletioninfoVo"/>
         <where>
             <if test="donorno != null  and donorno != ''"> and DonorNo = #{donorno}</if>
@@ -73,6 +73,9 @@
         `service_donatebaseinfo`.`RegisterCountyCode` AS `RegisterCountyCode`,
         `service_donatebaseinfo`.`RegisterCountyName` AS `RegisterCountyName`,
         `service_donatebaseinfo`.`create_by` AS `basecreateby`,
+        `service_donatebaseinfo`.`workflow` AS `workflow`,
+        `service_donatebaseinfo`.`termination_case` AS `terminationCase`,
+        `service_donatebaseinfo`.`donatetime` AS `donatetime`,
         `service_donatecompletioninfo`.`ID` AS `dcID`,
         `service_donatecompletioninfo`.`InfoID` AS `InfoID`,
         `service_donatecompletioninfo`.`DonorNo` AS `dcDonorNo`,
@@ -117,6 +120,7 @@
             <if test="reporterno != null  and reporterno != ''"> and `service_donatebaseinfo`.ReporterNo = #{reporterno}</if>
             <if test="city != null and city != ''"> and `base_organization`.`City` = #{city}</if>
             <if test="id != null "> and `service_donatebaseinfo`.`ID` = #{id}</if>
+            <if test="workflow != null "> and `service_donatebaseinfo`.`workflow` = #{workflow}</if>
     </where>
 
         order by `service_donatecompletioninfo`.`create_time` desc
@@ -147,4 +151,4 @@
         where InfoID = #{infoid}
     </update>
 
-</mapper>
\ No newline at end of file
+</mapper>

--
Gitblit v1.9.3