From b6dd47b05107fc36d8ff4f7f29a4446521f95503 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期四, 02 一月 2025 18:44:28 +0800
Subject: [PATCH] 代码提交
---
ruoyi-project/src/main/resources/mapper/project/ServiceRelativesconfirmationMapper.xml | 20 +++++++++++++++-----
1 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceRelativesconfirmationMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceRelativesconfirmationMapper.xml
index a695bd4..b922403 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceRelativesconfirmationMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceRelativesconfirmationMapper.xml
@@ -3,7 +3,7 @@
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.project.mapper.ServiceRelativesconfirmationMapper">
-
+
<resultMap type="com.ruoyi.project.domain.ServiceRelativesconfirmation" id="ServiceRelativesconfirmationResult">
<result property="id" column="ID" />
<result property="infoid" column="InfoID" />
@@ -45,13 +45,15 @@
<result property="createTime" column="create_time" />
<result property="updateBy" column="update_by" />
<result property="updateTime" column="update_time" />
+ <result property="operatorno" column="operatorno" />
+ <result property="operatorname" column="operatorname" />
</resultMap>
<sql id="selectServiceRelativesconfirmationVo">
- select ID, InfoID, DonorNo, Name, IDCardType, IDCardNo, Phone, ResidenceAddress, ResidenceProvince, ResidenceProvinceName, ResidenceCity, ResidenceCityName, ResidenceTown, ResidenceTownName, ResidenceCommunity, ResidenceCommunityName, ResidenceCountyCode, ResidenceCountyName, Kinship, Kinship_ChildrenNum, SignFamilyRelations, KinshipConfirmationSign, OrganDecision, OrganDecision_Other, RelativeConfirmationSign, FamilyRelations, AcquisitionTissueNo, AcquisitionTissueName, ResponsibleUserID, ResponsibleUserName, CoordinatedUserIDO, CoordinatedUserNameO, CoordinatedUserIDT, CoordinatedUserNameT, SignDate, del_flag, create_by, create_time, update_by, update_time from service_relativesconfirmation
+ select ID, InfoID, DonorNo, Name, IDCardType, IDCardNo, Phone, ResidenceAddress, ResidenceProvince, ResidenceProvinceName, ResidenceCity, ResidenceCityName, ResidenceTown, ResidenceTownName, ResidenceCommunity, ResidenceCommunityName, ResidenceCountyCode, ResidenceCountyName, Kinship, Kinship_ChildrenNum, SignFamilyRelations, KinshipConfirmationSign, OrganDecision, OrganDecision_Other, RelativeConfirmationSign, FamilyRelations, AcquisitionTissueNo, AcquisitionTissueName, ResponsibleUserID, ResponsibleUserName, CoordinatedUserIDO, CoordinatedUserNameO, CoordinatedUserIDT, CoordinatedUserNameT, SignDate, del_flag, create_by, create_time, update_by, update_time,operatorname,operatorno from service_relativesconfirmation
</sql>
- <select id="selectServiceRelativesconfirmationList" parameterType="ServiceRelativesconfirmation" resultMap="ServiceRelativesconfirmationResult">
+ <select id="selectServiceRelativesconfirmationList" parameterType="com.ruoyi.project.domain.ServiceRelativesconfirmation" resultMap="ServiceRelativesconfirmationResult">
<include refid="selectServiceRelativesconfirmationVo"/>
<where>
<if test="donorno != null and donorno != ''"> and DonorNo = #{donorno}</if>
@@ -102,6 +104,9 @@
`service_donatebaseinfo`.`TreatmentHospitalName` AS `TreatmentHospitalName`,
`service_donatebaseinfo`.`TreatmentDeptName` AS `TreatmentDeptName`,
`service_donatebaseinfo`.`create_by` AS `basecreateby`,
+ `service_donatebaseinfo`.`workflow` AS `workflow`,
+ `service_donatebaseinfo`.`termination_case` AS `terminationCase`,
+ `service_donatebaseinfo`.`donatetime` AS `donatetime`,
`service_relativesconfirmation`.`ID` AS `rcID`,
`service_relativesconfirmation`.`InfoID` AS `InfoID`,
`service_relativesconfirmation`.`DonorNo` AS `rcDonroNo`,
@@ -141,7 +146,9 @@
`service_relativesconfirmation`.`create_by` AS `createBy`,
`service_relativesconfirmation`.`create_time` AS `createTime`,
`service_relativesconfirmation`.`update_by` AS `updateBy`,
- `service_relativesconfirmation`.`update_time` AS `updateTime`
+ `service_relativesconfirmation`.`update_time` AS `updateTime`,
+ `service_relativesconfirmation`.`operatorno` AS `operatorno`,
+ `service_relativesconfirmation`.`operatorname` AS `operatorname`
FROM
`service_donatebaseinfo`
@@ -151,6 +158,8 @@
`base_organization`.`OrganizationID` = `service_donatebaseinfo`.`TreatmentHospitalNo`
<where>
+ service_donatebaseinfo.del_flag=0
+ and service_relativesconfirmation.del_flag=0
<if test="donorno != null and donorno != ''"> and `service_donatebaseinfo`.`DonorNo` = #{donorno}</if>
<if test="name != null and name != ''"> and `service_donatebaseinfo`.`Name` like concat('%', #{name}, '%')</if>
<if test="idcardno != null and idcardno != ''"> and `service_donatebaseinfo`.`IDCardNo` = #{idcardno}</if>
@@ -165,6 +174,7 @@
<if test="residenceprovince != null and residenceprovince != ''"> and `service_relativesconfirmation`.`ResidenceProvince` = #{residenceprovince}</if>
<if test="residencecity != null and residencecity != ''"> and `service_relativesconfirmation`.`ResidenceCity` = #{residencecity}</if>
<if test="residencetown != null and residencetown != ''"> and `service_relativesconfirmation`.`ResidenceTown` = #{residencetown}</if>
+ <if test="workflow != null "> and `service_donatebaseinfo`.`workflow` = #{workflow}</if>
</where>
@@ -176,4 +186,4 @@
where SignDate >= #{starttime} and SignDate <= #{endtime}
</select>
-</mapper>
\ No newline at end of file
+</mapper>
--
Gitblit v1.9.3