From d42096fd55c4b0caf84bb4f208b4e17534e158c1 Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期四, 21 五月 2026 15:34:49 +0800
Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/opo-qd
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceEthicalreviewopinionsController.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 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";
//鍒涘缓鏂囦欢澶�
--
Gitblit v1.9.3