From 4da424d7a48976c940d9012f5b1d3e178c273773 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 11 七月 2025 09:34:15 +0800
Subject: [PATCH] 代码提交
---
ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceRelativesconfirmation.java | 19 ++++
ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonationwitness.java | 166 ++++++++++++++++++++++++++++++++---------
ruoyi-project/src/main/resources/mapper/project/ServiceDonationwitnessMapper.xml | 12 +++
ruoyi-project/src/main/resources/mapper/project/ServiceRelativesconfirmationMapper.xml | 8 +
ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonatebaseinfo.java | 14 +++
ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/DonationWitnessVO.java | 4 +
ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/RelativeConfirmationVO.java | 1
ruoyi-project/src/main/resources/mapper/project/ServiceDonatebaseinfoMapper.xml | 4 +
8 files changed, 189 insertions(+), 39 deletions(-)
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonatebaseinfo.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonatebaseinfo.java
index 4fd181a..2dadab6 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonatebaseinfo.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonatebaseinfo.java
@@ -543,5 +543,17 @@
@ApiModelProperty("妗堜緥搴忓彿")
private String donateno;
+ @ApiModelProperty("褰撳墠鍖荤枟鏈烘瀯")
+ private String currentMedicalInstitution;
-}
\ No newline at end of file
+ @ApiModelProperty("棣栨鍖荤枟鏈烘瀯")
+ private String firstMedicalInstitution;
+
+ @ApiModelProperty("褰撳墠鍖荤枟鏈烘瀯绉戝")
+ private String currentDept;
+
+ @ApiModelProperty("棣栨鍖荤枟鏈烘瀯绉戝")
+ private String firstDept;
+
+
+}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonationwitness.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonationwitness.java
index 5557bc2..3b2eaca 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonationwitness.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonationwitness.java
@@ -1,6 +1,7 @@
package com.ruoyi.project.domain;
import java.util.Date;
+
import com.fasterxml.jackson.annotation.JsonFormat;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
@@ -12,184 +13,277 @@
/**
* 鎹愮尞瑙佽瘉瀵硅薄 service_donationwitness
- *
+ *
* @author ruoyi
* @date 2021-11-17
*/
@Data
@ApiModel("鎹愮尞瑙佽瘉")
-public class ServiceDonationwitness extends BaseEntity
-{
+public class ServiceDonationwitness extends BaseEntity {
private static final long serialVersionUID = 1L;
- /** $column.columnComment */
+ /**
+ * $column.columnComment
+ */
@ApiModelProperty("$column.columnComment")
//鏁版嵁搴撹嚜澧炴敼鎴怈TableId(type = IdType.AUTO)
@TableId(type = IdType.AUTO)
private Long id;
- /** */
+ /**
+ *
+ */
@ApiModelProperty("")
private Long infoid;
- /** 鎹愮尞鑰呯紪鍙� */
+ /**
+ * 鎹愮尞鑰呯紪鍙�
+ */
@ApiModelProperty("鎹愮尞鑰呯紪鍙�")
@Excel(name = "鎹愮尞鑰呯紪鍙�")
private String donorno;
- /** 鍣ㄥ畼鑾峰彇鏈烘瀯缂栧彿 */
+ /**
+ * 鍣ㄥ畼鑾峰彇鏈烘瀯缂栧彿
+ */
@ApiModelProperty("鍣ㄥ畼鑾峰彇鏈烘瀯缂栧彿")
private String gainhospitalno;
- /** 鍣ㄥ畼鑾峰彇鏈烘瀯鍚嶇О */
+ /**
+ * 鍣ㄥ畼鑾峰彇鏈烘瀯鍚嶇О
+ */
@ApiModelProperty("鍣ㄥ畼鑾峰彇鏈烘瀯鍚嶇О")
@Excel(name = "鍣ㄥ畼鑾峰彇鏈烘瀯鍚嶇О")
private String gainhospitalname;
- /** 姝讳骸鏃堕棿 */
+ /**
+ * 姝讳骸鏃堕棿
+ */
@ApiModelProperty("姝讳骸鏃堕棿")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "姝讳骸鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date deathtime;
- /** 姝讳骸鍘熷洜 */
+ /**
+ * 姝讳骸鍘熷洜
+ */
@ApiModelProperty("姝讳骸鍘熷洜")
@Excel(name = "姝讳骸鍘熷洜")
private String deathreason;
- /** 姝讳骸鍒ゅ畾鍖荤敓涓� */
+ /**
+ * 姝讳骸鍒ゅ畾鍖荤敓涓�
+ */
@ApiModelProperty("姝讳骸鍒ゅ畾鍖荤敓涓�")
@Excel(name = "姝讳骸鍒ゅ畾鍖荤敓涓�")
private String deathjudgedocto;
- /** 姝讳骸鍒ゅ畾鍖荤敓浜� */
+ /**
+ * 姝讳骸鍒ゅ畾鍖荤敓浜�
+ */
@ApiModelProperty("姝讳骸鍒ゅ畾鍖荤敓浜�")
@Excel(name = "姝讳骸鍒ゅ畾鍖荤敓浜�")
private String deathjudgedoctt;
- /** 姝讳骸璇佹槑闄勪欢璺緞 */
+ /**
+ * 姝讳骸璇佹槑闄勪欢璺緞
+ */
@ApiModelProperty("姝讳骸璇佹槑闄勪欢璺緞")
private String deathjudgeannex;
- /** 鎵嬫湳寮�濮嬫椂闂� */
+ /**
+ * 鎵嬫湳寮�濮嬫椂闂�
+ */
@ApiModelProperty("鎵嬫湳寮�濮嬫椂闂�")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "鎵嬫湳寮�濮嬫椂闂�", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date operationbegtime;
- /** 鎵嬫湳缁撴潫鏃堕棿 */
+ /**
+ * 鎵嬫湳缁撴潫鏃堕棿
+ */
@ApiModelProperty("鎵嬫湳缁撴潫鏃堕棿")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "鎵嬫湳缁撴潫鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date operationendtime;
- /** 鎵嬫湳鍖荤敓 */
+ /**
+ * 鎵嬫湳鍖荤敓
+ */
@ApiModelProperty("鎵嬫湳鍖荤敓")
@Excel(name = "鎵嬫湳鍖荤敓")
private String operationdoctor;
- /** 鏄惁榛樺搥缂呮��浠紡 */
+ /**
+ * 鏄惁榛樺搥缂呮��浠紡
+ */
@ApiModelProperty("鏄惁榛樺搥缂呮��浠紡")
@Excel(name = "鏄惁榛樺搥缂呮��浠紡")
private Integer isspendremember;
- /** 鏄惁鎭㈠閬椾綋浠 */
+ /**
+ * 鏄惁鎭㈠閬椾綋浠
+ */
@ApiModelProperty("鏄惁鎭㈠閬椾綋浠")
@Excel(name = "鏄惁鎭㈠閬椾綋浠")
private Integer isrestoreremains;
- /** 缂呮��浠紡闄勪欢璺緞 */
+ /**
+ * 缂呮��浠紡闄勪欢璺緞
+ */
@ApiModelProperty("缂呮��浠紡闄勪欢璺緞")
private String rememberannex;
- /** 璐熻矗浜虹紪鍙� */
+ /**
+ * 璐熻矗浜虹紪鍙�
+ */
@ApiModelProperty("璐熻矗浜虹紪鍙�")
private String responsibleuserid;
- /** 璐熻矗浜哄鍚� */
+ /**
+ * 璐熻矗浜哄鍚�
+ */
@ApiModelProperty("璐熻矗浜哄鍚�")
@Excel(name = "璐熻矗浜哄鍚�")
private String responsibleusername;
- /** 鑱旂粶浜轰竴缂栧彿 */
+ /**
+ * 鑱旂粶浜轰竴缂栧彿
+ */
@ApiModelProperty("鑱旂粶浜轰竴缂栧彿")
private String coordinateduserido;
- /** 鑱旂粶浜轰竴濮撳悕 */
+ /**
+ * 鑱旂粶浜轰竴濮撳悕
+ */
@ApiModelProperty("鑱旂粶浜轰竴濮撳悕")
private String coordinatedusernameo;
- /** 鑱旂粶浜轰簩缂栧彿 */
+ /**
+ * 鑱旂粶浜轰簩缂栧彿
+ */
@ApiModelProperty("鑱旂粶浜轰簩缂栧彿")
private String coordinateduseridt;
- /** 鑱旂粶浜轰簩濮撳悕 */
+ /**
+ * 鑱旂粶浜轰簩濮撳悕
+ */
@ApiModelProperty("鑱旂粶浜轰簩濮撳悕")
private String coordinatedusernamet;
- /** 鑵逛富鍔ㄨ剦鎻掔鏃堕棿 */
+ /**
+ * 鑵逛富鍔ㄨ剦鎻掔鏃堕棿
+ */
@ApiModelProperty("鑵逛富鍔ㄨ剦鎻掔鏃堕棿")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "鑵逛富鍔ㄨ剦鎻掔鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date abdominalaortacannulatime;
- /** 鑵逛富鍔ㄨ剦鐏屾敞鏃堕棿 */
+ /**
+ * 鑵逛富鍔ㄨ剦鐏屾敞鏃堕棿
+ */
@ApiModelProperty("鑵逛富鍔ㄨ剦鐏屾敞鏃堕棿")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "鑵逛富鍔ㄨ剦鐏屾敞鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date abdominalaortaperfusiontime;
- /** 闂ㄩ潤鑴夋彃绠℃椂闂� */
+ /**
+ * 闂ㄩ潤鑴夋彃绠℃椂闂�
+ */
@ApiModelProperty("闂ㄩ潤鑴夋彃绠℃椂闂�")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "闂ㄩ潤鑴夋彃绠℃椂闂�", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date portalveincannulatime;
- /** 闂ㄩ潤鑴夌亴娉ㄦ椂闂� */
+ /**
+ * 闂ㄩ潤鑴夌亴娉ㄦ椂闂�
+ */
@ApiModelProperty("闂ㄩ潤鑴夌亴娉ㄦ椂闂�")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "闂ㄩ潤鑴夌亴娉ㄦ椂闂�", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date portalveinperfusiontime;
- /** 鑲哄姩鑴夋彃绠℃椂闂� */
+ /**
+ * 鑲哄姩鑴夋彃绠℃椂闂�
+ */
@ApiModelProperty("鑲哄姩鑴夋彃绠℃椂闂�")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "鑲哄姩鑴夋彃绠℃椂闂�", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date pulmonaryarterycannulatime;
- /** 鑲哄姩鑴夌亴娉ㄦ椂闂� */
+ /**
+ * 鑲哄姩鑴夌亴娉ㄦ椂闂�
+ */
@ApiModelProperty("鑲哄姩鑴夌亴娉ㄦ椂闂�")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "鑲哄姩鑴夌亴娉ㄦ椂闂�", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date pulmonaryarteryperfusiontime;
- /** 涓诲姩鑴夋彃绠℃椂闂� */
+ /**
+ * 涓诲姩鑴夋彃绠℃椂闂�
+ */
@ApiModelProperty("涓诲姩鑴夋彃绠℃椂闂�")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "涓诲姩鑴夋彃绠℃椂闂�", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date aortacannulatime;
- /** 涓诲姩鑴夌亴娉ㄦ椂闂� */
+ /**
+ * 涓诲姩鑴夌亴娉ㄦ椂闂�
+ */
@ApiModelProperty("涓诲姩鑴夌亴娉ㄦ椂闂�")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "涓诲姩鑴夌亴娉ㄦ椂闂�", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date aortaperfusiontime;
- /** 鎹愮尞鍣ㄥ畼 */
+ /**
+ * 鎹愮尞鍣ㄥ畼
+ */
@ApiModelProperty("鎹愮尞鍣ㄥ畼")
@Excel(name = "鎹愮尞鍣ㄥ畼")
private String organdonation;
- /** 鎹愮尞鍣ㄥ畼 鍏朵粬 */
+ /**
+ * 鎹愮尞鍣ㄥ畼 鍏朵粬
+ */
@ApiModelProperty("鎹愮尞鍣ㄥ畼 鍏朵粬")
@Excel(name = "鎹愮尞鍣ㄥ畼 鍏朵粬")
private String organdonationOther;
- /** 鎹愮尞绫诲埆 */
+ /**
+ * 鎹愮尞绫诲埆
+ */
@ApiModelProperty("鎹愮尞绫诲埆")
@Excel(name = "鎹愮尞绫诲埆")
private String donationcategory;
+ /**
+ * 鍗忚皟鍛樿繘鎵嬫湳瀹ゆ椂闂�
+ */
+ @ApiModelProperty("鍗忚皟鍛樿繘鎵嬫湳瀹ゆ椂闂�")
+ @Excel(name = "鍗忚皟鍛樿繘鎵嬫湳瀹ゆ椂闂�")
+ private Date coordinatorInOperating;
+
+ /**
+ * 鍗忚皟鍛樺嚭鎵嬫湳瀹ゆ椂闂�
+ */
+ @ApiModelProperty("鍗忚皟鍛樺嚭鎵嬫湳瀹ゆ椂闂�")
+ @Excel(name = "鍗忚皟鍛樺嚭鎵嬫湳瀹ゆ椂闂�")
+ private Date coordinatorOutOperating;
+
+ /**
+ * 鍗忚皟鍛樼瀛�
+ */
+ @ApiModelProperty("鍗忚皟鍛樼瀛�")
+ @Excel(name = "鍗忚皟鍛樼瀛�")
+ private String coorinatorSign;
+
+ /**
+ * 鍗忚皟鍛樼瀛楁椂闂�
+ */
+ @ApiModelProperty("鍗忚皟鍛樼瀛楁椂闂�")
+ @Excel(name = "鍗忚皟鍛樼瀛楁椂闂�")
+ private Date coorinatorSignTime;
+
}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceRelativesconfirmation.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceRelativesconfirmation.java
index a9a64be..2e8e047 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceRelativesconfirmation.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceRelativesconfirmation.java
@@ -12,7 +12,7 @@
/**
* 鎹愮尞浜插睘纭瀵硅薄 service_relativesconfirmation
- *
+ *
* @author ruoyi
* @date 2021-11-15
*/
@@ -185,5 +185,22 @@
@Excel(name = "绛剧讲鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date signdate;
+
+ /** 姘戞棌 */
+ @ApiModelProperty("姘戞棌")
+ private String nation;
+
+
+ /** 瀛﹀巻 */
+ @ApiModelProperty("瀛﹀巻")
+ private String education;
+
+
+
+ /** 鑱屼笟 */
+ @ApiModelProperty("鑱屼笟")
+ private String work;
+
+
}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/DonationWitnessVO.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/DonationWitnessVO.java
index 2c6153f..66c6592 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/DonationWitnessVO.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/DonationWitnessVO.java
@@ -107,6 +107,10 @@
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date endtime;
private String city;
+ private Date coordinatorInOperating;
+ private Date coordinatorOutOperating;
+ private String coorinatorSign;
+ private Date coorinatorSignTime;
private Integer workflow;
private Integer terminationCase;
}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/RelativeConfirmationVO.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/RelativeConfirmationVO.java
index 4ef4b85..782aac2 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/RelativeConfirmationVO.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/RelativeConfirmationVO.java
@@ -107,6 +107,7 @@
private String city;
private String operatorno;
private String operatorname;
+ private String work;
private Integer workflow;
private Integer terminationCase;
}
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceDonatebaseinfoMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceDonatebaseinfoMapper.xml
index 06d5f08..c0d8a35 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceDonatebaseinfoMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceDonatebaseinfoMapper.xml
@@ -81,6 +81,10 @@
<result property="workflow" column="workflow"/>
<result property="donatetime" column="donatetime"/>
<result property="donateno" column="donateno"/>
+ <result property="currentMedicalInstitution" column="current_medical_institution"/>
+ <result property="firstMedicalInstitution" column="first_medical_institution"/>
+ <result property="currentDept" column="current_dept"/>
+ <result property="firstDept" column="first_dept"/>
</resultMap>
<sql id="selectServiceDonatebaseinfoVo">
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceDonationwitnessMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceDonationwitnessMapper.xml
index 6e6900e..817458c 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceDonationwitnessMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceDonationwitnessMapper.xml
@@ -43,11 +43,19 @@
<result property="organdonation" column="OrganDonation"/>
<result property="organdonationOther" column="OrganDonation_Other"/>
<result property="donationcategory" column="DonationCategory"/>
+ <result property="coordinatorInOperating" column="coordinator_in_operating"/>
+ <result property="coordinatorOutOperating" column="coordinator_out_operating"/>
+ <result property="coorinatorSign" column="coorinator_sign"/>
+ <result property="coorinatorSignTime" column="coorinator_sign_time"/>
</resultMap>
<sql id="selectServiceDonationwitnessVo">
select ID,
InfoID,
+ coordinator_in_operating,
+ coordinator_out_operating,
+ coorinator_sign,
+ coorinator_sign_time,
DonorNo,
GainHospitalNo,
GainHospitalName,
@@ -160,6 +168,10 @@
`service_donationwitness`.`create_time` AS `createtime`,
`service_donationwitness`.`update_by` AS `updateby`,
`service_donationwitness`.`update_time` AS `updatetime`
+ `service_donationwitness`.`coordinator_in_operating` AS `coordinatorInOperating`
+ `service_donationwitness`.`coordinator_out_operating` AS `coordinatorOutOperating`
+ `service_donationwitness`.`coorinator_sign` AS `coorinatorSign`
+ `service_donationwitness`.`coorinator_sign_time` AS `coorinatorSignTime`
FROM
`service_donatebaseinfo`
LEFT JOIN `service_donationwitness` ON
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceRelativesconfirmationMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceRelativesconfirmationMapper.xml
index b922403..c30ff7b 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">
@@ -149,6 +152,9 @@
`service_relativesconfirmation`.`update_time` AS `updateTime`,
`service_relativesconfirmation`.`operatorno` AS `operatorno`,
`service_relativesconfirmation`.`operatorname` AS `operatorname`
+ `service_relativesconfirmation`.`nation` AS `nation`
+ `service_relativesconfirmation`.`education` AS `education`
+ `service_relativesconfirmation`.`work` AS `work`
FROM
`service_donatebaseinfo`
--
Gitblit v1.9.3