From 4c141764d64c37c4c27e372cd55d9e861b192c28 Mon Sep 17 00:00:00 2001
From: sinake <sinake1@qq.com>
Date: 星期六, 09 五月 2026 18:06:49 +0800
Subject: [PATCH] 捐献基础增加入院时间,捐献上报基础增加入院时间
---
ruoyi-project/src/main/resources/mapper/project/ServiceDonatemaintenanceMapper.xml | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceDonatemaintenanceMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceDonatemaintenanceMapper.xml
index e2fc8ae..6a74211 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceDonatemaintenanceMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceDonatemaintenanceMapper.xml
@@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.project.mapper.ServiceDonatemaintenanceMapper">
- <resultMap type="com.ruoyi.project.domain.ServiceDonatemaintenance" id="ServiceDonatemaintenanceResult">
+ <resultMap type="com.ruoyi.project.domain.entity.ServiceDonatemaintenanceEntity" id="ServiceDonatemaintenanceResult">
<result property="id" column="ID"/>
<result property="infoid" column="InfoID"/>
<result property="caseNo" column="case_no"/>
@@ -38,7 +38,7 @@
</sql>
<select id="selectServiceDonatemaintenanceList" parameterType="com.ruoyi.project.domain.vo.MaintenanceBaseInfoVO"
- resultType="com.ruoyi.project.domain.dto.MaintenanceBaseInfoDTO">
+ resultType="com.ruoyi.project.domain.entity.MaintenanceBaseInfoEntity">
select
sd.treatmenthospitalname AS treatmenthospitalname,
sd.treatmenthospitalno AS treatmenthospitalno,
@@ -63,7 +63,8 @@
sdm.item_name as itemName,
sdm.item_time as itemTime,
sdt.DeathTime as deathTime,
- sdm.item_desc as itemDesc
+ sdm.item_desc as itemDesc,
+ sdm.state
FROM
service_donatebaseinfo sd
LEFT JOIN service_donatemaintenance sdm ON sd.ID = sdm.InfoID
@@ -78,12 +79,13 @@
<if test="caseNo != null and caseNo != ''">and case_no = #{caseNo}</if>
<if test="reportTime != null ">and ReportTime = #{reportTime}</if>
<if test="donorno != null and donorno != ''">and DonorNo = #{donorno}</if>
- <if test="name != null and name != ''">and name = #{name}</if>
- <if test="coordinatorName != null and coordinatorName != ''">and coordinator_name = #{coordinatorName}</if>
+ <if test="name != null and name != ''">and name like concat('%', #{name}, '%')</if>
+ <if test="coordinatorName != null and coordinatorName != ''">and coordinator_name like concat('%', #{coordinatorName}, '%')</if>
<if test="itemNo != null and itemNo != ''">and item_no = #{itemNo}</if>
<if test="itemName != null and itemName != ''">and item_name like concat('%', #{itemName}, '%')</if>
<if test="itemTime != null ">and item_time = #{itemTime}</if>
<if test="itemDesc != null and itemDesc != ''">and item_desc = #{itemDesc}</if>
+ <if test="id != null ">and sdt.id = #{id}</if>
</where>
<if test="pageNum != null and pageSize != null">limit #{pageNum},#{pageSize}</if>
</select>
--
Gitblit v1.9.3