From 72fe6f7da4a4cdcd4e086f5ca1a1e82b93551513 Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期四, 30 七月 2026 09:19:22 +0800
Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/~yxh/opo
---
ruoyi-project/src/main/resources/mapper/project/ServiceDonationwitnessorganMapper.xml | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceDonationwitnessorganMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceDonationwitnessorganMapper.xml
index 3e021ca..6c7e370 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceDonationwitnessorganMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceDonationwitnessorganMapper.xml
@@ -27,12 +27,18 @@
<result property="createTime" column="create_time"/>
<result property="updateBy" column="update_by"/>
<result property="updateTime" column="update_time"/>
+ <result property="name" column="name"/>
+ <result property="caseno" column="caseno"/>
+ <result property="sort" column="sort"/>
+ <result property="organStartTime" column="organ_start_time"/>
</resultMap>
<sql id="selectServiceDonationwitnessorganVo">
select ID,
InfoID,
+ sort,
DonorNo,
+ organ_start_time,
OrganNo,
OrganName,
OrganNumber,
@@ -52,6 +58,8 @@
create_by,
create_time,
update_by,
+ caseno,
+ name,
update_time
from service_donationwitnessorgan
</sql>
@@ -62,6 +70,7 @@
<include refid="selectServiceDonationwitnessorganVo"/>
<where>
<if test="infoid != null ">and InfoID = #{infoid}</if>
+ <if test="sort != null ">and sort = #{sort}</if>
<if test="donorno != null and donorno != ''">and DonorNo = #{donorno}</if>
<if test="organno != null and organno != ''">and OrganNo = #{organno}</if>
<if test="organname != null and organname != ''">and OrganName like concat('%', #{organname}, '%')</if>
@@ -82,7 +91,8 @@
</if>
<if test="ispnf != null and ispnf != ''">and IsPNF = #{ispnf}</if>
<if test="isdgf != null and isdgf != ''">and IsDGF = #{isdgf}</if>
+ <if test="organStartTime != null">and organ_start_time = #{organStartTime}</if>
</where>
</select>
-</mapper>
\ No newline at end of file
+</mapper>
--
Gitblit v1.9.3