From c9d322390ffa1a58cb53837d5351e1b03199fffd Mon Sep 17 00:00:00 2001
From: sinake <sinake1@qq.com>
Date: 星期三, 06 五月 2026 16:40:54 +0800
Subject: [PATCH] 捐献基础表新增见证状态
---
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonateorganBaseServiceImpl.java | 4 ++--
ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/ServiceDonationwitnessVO.java | 6 ++++++
ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonationwitness.java | 7 +++++++
ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceDonateorganBaseService.java | 2 +-
ruoyi-project/src/main/resources/mapper/project/ServiceDonationwitnessMapper.xml | 9 +++++++--
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonateorganBaseController.java | 14 +++++++-------
ruoyi-project/src/main/java/com/ruoyi/project/domain/dto/DonationwitnessBaseInfoDTO.java | 7 +++++++
7 files changed, 37 insertions(+), 12 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonateorganBaseController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonateorganBaseController.java
index 9d5831f..8fc6f2b 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonateorganBaseController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonateorganBaseController.java
@@ -105,16 +105,16 @@
* 鏂板鎹愮尞鍣ㄥ畼鍒嗛厤鍩虹
*/
@ApiOperation("鏂板鎹愮尞鍣ㄥ畼鍒嗛厤鍩虹")
- @UniqueCheck(
- fields = {"infoid"},
- entityClass = ServiceDonateorganBaseVO.class,
- serviceClass = IServiceDonateorganBaseService.class,
- message = "鏂板浼︾悊瀹℃煡鐨刬nfoid宸插瓨鍦�,鏃犳硶淇濆瓨!"
- )
+// @UniqueCheck(
+// fields = {"infoid"},
+// entityClass = ServiceDonateorganBaseVO.class,
+// serviceClass = IServiceDonateorganBaseService.class,
+// message = "鏂板浼︾悊瀹℃煡鐨刬nfoid宸插瓨鍦�,鏃犳硶淇濆瓨!"
+// )
@PostMapping("/add")
@RepeatSubmit
public AjaxResult add(@RequestBody ServiceDonateorganBaseVO serviceDonateorganBaseVO) {
- return toAjax(serviceDonateorganBaseService.add(serviceDonateorganBaseVO));
+ return AjaxResult.success(serviceDonateorganBaseService.add(serviceDonateorganBaseVO));
}
/**
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 c45ab2f..95f612a 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
@@ -288,5 +288,12 @@
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date coordinatorSignTime;
+ /**
+ * 瑙佽瘉鐘舵��1寰呰幏鍙栥��2杩涜涓��3鑾峰彇瀹屾垚銆�4鏀惧純
+ */
+ @ApiModelProperty("瑙佽瘉鐘舵��1寰呰幏鍙栥��2杩涜涓��3鑾峰彇瀹屾垚銆�4鏀惧純")
+ @Excel(name = "瑙佽瘉鐘舵��1寰呰幏鍙栥��2杩涜涓��3鑾峰彇瀹屾垚銆�4鏀惧純")
+ private String witnessState;
+
}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/dto/DonationwitnessBaseInfoDTO.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/dto/DonationwitnessBaseInfoDTO.java
index f76c7a4..46d8ce8 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/dto/DonationwitnessBaseInfoDTO.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/dto/DonationwitnessBaseInfoDTO.java
@@ -378,5 +378,12 @@
@ApiModelProperty("鍣ㄥ畼鍒楄〃闆嗗悎")
List<ServiceDonationwitnessorgan> serviceDonationwitnessorgans;
+
+ /**
+ * 瑙佽瘉鐘舵��1寰呰幏鍙栥��2杩涜涓��3鑾峰彇瀹屾垚銆�4鏀惧純
+ */
+ @ApiModelProperty("瑙佽瘉鐘舵��1寰呰幏鍙栥��2杩涜涓��3鑾峰彇瀹屾垚銆�4鏀惧純")
+ @Excel(name = "瑙佽瘉鐘舵��1寰呰幏鍙栥��2杩涜涓��3鑾峰彇瀹屾垚銆�4鏀惧純")
+ private String witnessState;
}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/ServiceDonationwitnessVO.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/ServiceDonationwitnessVO.java
index 495d8ea..b5ce38e 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/ServiceDonationwitnessVO.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/ServiceDonationwitnessVO.java
@@ -295,5 +295,11 @@
@ApiModelProperty("鎹愮尞瑙佽瘉鍣ㄥ畼淇℃伅闆嗗悎")
private List<ServiceDonationwitnessorgan> serviceDonationwitnessorganList;
+ /**
+ * 瑙佽瘉鐘舵��1寰呰幏鍙栥��2杩涜涓��3鑾峰彇瀹屾垚銆�4鏀惧純
+ */
+ @ApiModelProperty("瑙佽瘉鐘舵��1寰呰幏鍙栥��2杩涜涓��3鑾峰彇瀹屾垚銆�4鏀惧純")
+ @Excel(name = "瑙佽瘉鐘舵��1寰呰幏鍙栥��2杩涜涓��3鑾峰彇瀹屾垚銆�4鏀惧純")
+ private String witnessState;
}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceDonateorganBaseService.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceDonateorganBaseService.java
index d741ddd..21ced26 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceDonateorganBaseService.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceDonateorganBaseService.java
@@ -43,7 +43,7 @@
public List<ServiceDonateorganBase> exportQueryList(ServiceDonateorganBase serviceDonateorganBase);
- public Boolean add(ServiceDonateorganBaseVO serviceDonateorganBaseVO);
+ public long add(ServiceDonateorganBaseVO serviceDonateorganBaseVO);
public Boolean updateByParam(ServiceDonateorganBaseVO serviceDonateorganBaseVO);
}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonateorganBaseServiceImpl.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonateorganBaseServiceImpl.java
index 224028a..d1a21d1 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonateorganBaseServiceImpl.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonateorganBaseServiceImpl.java
@@ -128,7 +128,7 @@
}
@Override
- public Boolean add(ServiceDonateorganBaseVO serviceDonateorganBaseVO) {
+ public long add(ServiceDonateorganBaseVO serviceDonateorganBaseVO) {
ServiceDonateorganBase serviceDonateorganBase = DtoConversionUtils.sourceToTarget(serviceDonateorganBaseVO, ServiceDonateorganBase.class);
boolean save = false;
if (ObjectUtils.isNotEmpty(serviceDonateorganBase)) {
@@ -141,7 +141,7 @@
}
}
- return save;
+ return serviceDonateorganBase.getId();
}
@Override
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceDonationwitnessMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceDonationwitnessMapper.xml
index 4b86477..0c66ac5 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceDonationwitnessMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceDonationwitnessMapper.xml
@@ -47,6 +47,8 @@
<result property="coordinatorOutOperating" column="coordinator_out_operating"/>
<result property="coordinatorSign" column="coordinator_sign"/>
<result property="coordinatorSignTime" column="coordinator_sign_time"/>
+ <result property="witnessState" column="witness_state"/>
+
</resultMap>
<sql id="selectServiceDonationwitnessVo">
@@ -91,7 +93,8 @@
update_time,
OrganDonation,
OrganDonation_Other,
- donationcategory
+ donationcategory,
+ witness_state
from service_donationwitness
</sql>
@@ -153,7 +156,9 @@
st.AortaPerfusionTime as aortaperfusiontime,
st.OrganDonation as organdonation,
st.OrganDonation_Other as organdonationOther,
- st.DonationCategory as donationcategory
+ st.DonationCategory as donationcategory,
+ st.DeathJudgeAnnex as deathjudgeannex,
+ st.witness_state as witnessState
FROM
service_donatebaseinfo sd
LEFT JOIN service_donationwitness st ON sd.ID = st.InfoID
--
Gitblit v1.9.3