From 519886a70d630e3cdd6c0f40f55fcebc6e780dc5 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期二, 19 三月 2024 17:45:11 +0800
Subject: [PATCH] 代码提交
---
ruoyi-project/src/main/resources/mapper/project/ServiceRelativesconfirmationMapper.xml | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceRelativesconfirmationMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceRelativesconfirmationMapper.xml
index 5ae6253..0211b64 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceRelativesconfirmationMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceRelativesconfirmationMapper.xml
@@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.project.mapper.ServiceRelativesconfirmationMapper">
- <resultMap type="ServiceRelativesconfirmation" id="ServiceRelativesconfirmationResult">
+ <resultMap type="com.ruoyi.project.domain.ServiceRelativesconfirmation" id="ServiceRelativesconfirmationResult">
<result property="id" column="ID" />
<result property="infoid" column="InfoID" />
<result property="donorno" column="DonorNo" />
@@ -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,8 @@
`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_relativesconfirmation`.`ID` AS `rcID`,
`service_relativesconfirmation`.`InfoID` AS `InfoID`,
`service_relativesconfirmation`.`DonorNo` AS `rcDonroNo`,
@@ -141,7 +145,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`
@@ -165,6 +171,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>
--
Gitblit v1.9.3