From 773093a776d92a6d76023698e7054f6b1f9b6c03 Mon Sep 17 00:00:00 2001
From: sinake <sinake1@qq.com>
Date: 星期三, 28 十月 2026 17:05:24 +0800
Subject: [PATCH] 官费用表明细

---
 ruoyi-project/src/main/resources/mapper/project/ServiceDonationwitnessorganMapper.xml |   14 +++++++++++++-
 1 files changed, 13 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..67b20fe 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,10 @@
             </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>
+        <!-- 2026-10-23锛氭寜鍣ㄥ畼鎺掗槦搴忓彿鎺掑簭锛堢┖鐨勬帓鏈�鍚庯紝鍐嶆寜涓婚敭鍏滃簳锛� -->
+        order by (sort is null or sort = 0), sort asc, ID asc
     </select>
 
-</mapper>
\ No newline at end of file
+</mapper>

--
Gitblit v1.9.3