From a060b902fa7083c7cdcc4ae379f629b5d3c6d472 Mon Sep 17 00:00:00 2001
From: sinake <sinake1@qq.com>
Date: 星期三, 20 五月 2026 16:12:50 +0800
Subject: [PATCH] 捐献器官分配分配状态修改
---
ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonateorganBase.java | 2 +-
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceEthicalreviewopinionsController.java | 10 +++++-----
ruoyi-project/src/main/java/com/ruoyi/project/domain/dto/DonateorganBaseInfoDTO.java | 2 +-
ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/DonateorganBaseInfoVO.java | 2 +-
ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/ServiceDonateorganBaseVO.java | 2 +-
5 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceEthicalreviewopinionsController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceEthicalreviewopinionsController.java
index 999ed53..41c248d 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceEthicalreviewopinionsController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceEthicalreviewopinionsController.java
@@ -190,17 +190,17 @@
*/
@ApiOperation("閬椾綋鍣ㄥ畼鑾峰彇浼︾悊瀹℃煡琛�")
@GetMapping(value = "/download")
- public Result downloadInfo(String initiateId) throws IOException {
- if(ObjectUtils.isEmpty(initiateId)){
+ public Result downloadInfo(String nitiateId) throws IOException {
+ if(ObjectUtils.isEmpty(nitiateId)){
return Result.error("nitiateId浼︾悊瀹℃煡id涓嶈兘涓虹┖");
}
EthicalReviewVO reviewVO =new EthicalReviewVO();
- reviewVO.setNitiateId(initiateId);
+ reviewVO.setNitiateId(nitiateId);
List<EthicalReviewVO> list = serviceEthicalreviewopinionsService.selectVOList(reviewVO);
if(list.size()==0){
return Result.error("浼︾悊瀹℃煡id鏃犵浉鍏虫暟鎹�");
}
- EthicalreviewopinionsStateTotalVO stateTotalVO=serviceEthicalreviewopinionsService.stateTotalAll(initiateId);
+ EthicalreviewopinionsStateTotalVO stateTotalVO=serviceEthicalreviewopinionsService.stateTotalAll(nitiateId);
String filePath = getClass().getResource("/template/").getPath();
if(filePath.substring(0,1).equals("/"))
filePath=filePath.substring(1);
@@ -315,7 +315,7 @@
e.printStackTrace();
}
String newTime = String.valueOf(Calendar.getInstance().getTimeInMillis());
- String name = "閬椾綋鍣ㄥ畼鑾峰彇浼︾悊瀹℃煡琛╛"+initiateId+"_" + newTime;
+ String name = "閬椾綋鍣ㄥ畼鑾峰彇浼︾悊瀹℃煡琛╛"+nitiateId+"_" + newTime;
String filePathData =RuoYiConfig.getProfile() + "/download/wordtemplate";
//鍒涘缓鏂囦欢澶�
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonateorganBase.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonateorganBase.java
index ae5b8ff..7dc8333 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonateorganBase.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonateorganBase.java
@@ -36,7 +36,7 @@
/** 鍒嗛厤鐘舵�侊細0:鏈垎閰嶏紱1锛氬凡鍒嗛厤锛�2浣滃簾 */
@ApiModelProperty("鍒嗛厤鐘舵�侊細0:鏈垎閰嶏紱1锛氬凡鍒嗛厤锛�2浣滃簾")
@Excel(name = "鍒嗛厤鐘舵�侊細0:鏈垎閰嶏紱1锛氬凡鍒嗛厤锛�2浣滃簾")
- private Long allocationStatus;
+ private String allocationStatus;
/** 鍒嗛厤鏃堕棿 */
@ApiModelProperty("鍒嗛厤鏃堕棿")
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/dto/DonateorganBaseInfoDTO.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/dto/DonateorganBaseInfoDTO.java
index f953bde..8fd5174 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/dto/DonateorganBaseInfoDTO.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/dto/DonateorganBaseInfoDTO.java
@@ -134,7 +134,7 @@
*/
@ApiModelProperty("鍒嗛厤鐘舵�侊細0:鏈垎閰嶏紱1锛氬凡鍒嗛厤锛�2浣滃簾")
@Excel(name = "鍒嗛厤鐘舵�侊細0:鏈垎閰嶏紱1锛氬凡鍒嗛厤锛�2浣滃簾")
- private Long allocationStatus;
+ private String allocationStatus;
/**
* 鍒嗛厤鏃堕棿
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/DonateorganBaseInfoVO.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/DonateorganBaseInfoVO.java
index be7b787..602dadb 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/DonateorganBaseInfoVO.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/DonateorganBaseInfoVO.java
@@ -117,7 +117,7 @@
*/
@ApiModelProperty("鍒嗛厤鐘舵�侊細0:鏈垎閰嶏紱1锛氬凡鍒嗛厤锛�2浣滃簾")
@Excel(name = "鍒嗛厤鐘舵�侊細0:鏈垎閰嶏紱1锛氬凡鍒嗛厤锛�2浣滃簾")
- private Long allocationStatus;
+ private String allocationStatus;
/**
* 鍒嗛厤鏃堕棿
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/ServiceDonateorganBaseVO.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/ServiceDonateorganBaseVO.java
index fdba22d..e072634 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/ServiceDonateorganBaseVO.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/ServiceDonateorganBaseVO.java
@@ -44,7 +44,7 @@
*/
@ApiModelProperty("鍒嗛厤鐘舵�侊細0:鏈垎閰嶏紱1锛氬凡鍒嗛厤锛�2浣滃簾")
@Excel(name = "鍒嗛厤鐘舵�侊細0:鏈垎閰嶏紱1锛氬凡鍒嗛厤锛�2浣滃簾")
- private Long allocationStatus;
+ private String allocationStatus;
/**
* 鍒嗛厤鏃堕棿
--
Gitblit v1.9.3