From 519886a70d630e3cdd6c0f40f55fcebc6e780dc5 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期二, 19 三月 2024 17:45:11 +0800
Subject: [PATCH] 代码提交
---
ruoyi-project/src/main/resources/mapper/project/ServiceDonatecompletioninfoMapper.xml | 7 +++++--
1 files changed, 5 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 4ee365e..c113b15 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceDonatecompletioninfoMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceDonatecompletioninfoMapper.xml
@@ -4,7 +4,7 @@
"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,8 @@
`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_donatecompletioninfo`.`ID` AS `dcID`,
`service_donatecompletioninfo`.`InfoID` AS `InfoID`,
`service_donatecompletioninfo`.`DonorNo` AS `dcDonorNo`,
@@ -117,6 +119,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
--
Gitblit v1.9.3