From 2136ebf3c9a32430a27b5c50d7a7452cc3b30fdd Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 05 九月 2025 15:34:34 +0800
Subject: [PATCH] 审批日志
---
ruoyi-project/src/main/resources/mapper/project/ServiceRelativesconfirmationMapper.xml | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceRelativesconfirmationMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceRelativesconfirmationMapper.xml
index 9a6d0be..4f1ce55 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceRelativesconfirmationMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceRelativesconfirmationMapper.xml
@@ -47,10 +47,13 @@
<result property="updateTime" column="update_time" />
<result property="operatorno" column="operatorno" />
<result property="operatorname" column="operatorname" />
+ <result property="nation" column="nation" />
+ <result property="education" column="education" />
+ <result property="work" column="work" />
</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,operatorname,operatorno from service_relativesconfirmation
+ select ID, InfoID,nation,education,work, 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="com.ruoyi.project.domain.ServiceRelativesconfirmation" resultMap="ServiceRelativesconfirmationResult">
@@ -148,7 +151,10 @@
`service_relativesconfirmation`.`update_by` AS `updateBy`,
`service_relativesconfirmation`.`update_time` AS `updateTime`,
`service_relativesconfirmation`.`operatorno` AS `operatorno`,
- `service_relativesconfirmation`.`operatorname` AS `operatorname`
+ `service_relativesconfirmation`.`operatorname` AS `operatorname`,
+ `service_relativesconfirmation`.`nation` AS `nation`,
+ `service_relativesconfirmation`.`education` AS `education`,
+ `service_relativesconfirmation`.`work` AS `work`
FROM
`service_donatebaseinfo`
@@ -158,6 +164,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>
--
Gitblit v1.9.3