From f870c75611b343584741403f8991ef48a9eb4e42 Mon Sep 17 00:00:00 2001
From: sinake <sinake1@qq.com>
Date: 星期四, 14 五月 2026 17:42:29 +0800
Subject: [PATCH] 伦理审查专家新增获取伦理审查专家接收、获取伦理审查专家数量、专家统计详情、专家类型、伦理审查id、专家编号
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceEthicalreviewopinionsController.java | 6 +++---
ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceEthicalreviewopinions.java | 4 ++++
ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/EthicalReviewVO.java | 4 +++-
ruoyi-project/src/main/resources/mapper/project/ServiceEthicalreviewinitiateMapper.xml | 2 +-
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceEthicalreviewinitiateController.java | 6 ++++++
ruoyi-project/src/main/resources/mapper/project/ServiceEthicalreviewopinionsMapper.xml | 3 ++-
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceExternalpersonController.java | 11 ++++++++++-
ruoyi-admin/src/main/resources/application.yml | 2 +-
8 files changed, 30 insertions(+), 8 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceEthicalreviewinitiateController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceEthicalreviewinitiateController.java
index 5eb4a11..9e6cbd6 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceEthicalreviewinitiateController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceEthicalreviewinitiateController.java
@@ -131,6 +131,12 @@
public AjaxResult edit(@RequestBody ServiceEthicalreviewinitiate serviceEthicalreviewinitiate) {
boolean result=serviceEthicalreviewinitiateService.updateById(serviceEthicalreviewinitiate);
if (result) {
+ for(ServiceEthicalreviewopinions row: serviceEthicalreviewinitiate.getEthicalreviewopinionsList()){
+ if(ObjectUtils.isNotEmpty(row.getId())){
+ serviceEthicalreviewopinionsService.updateById(row);
+ }
+
+ }
return AjaxResult.success();
} else
return AjaxResult.error();
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 34c95fd..c86e635 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
@@ -101,7 +101,7 @@
return AjaxResult.success(serviceEthicalreviewopinions);
}
- @ApiOperation("浼︾悊瀹℃煡涓撳鎰忚")
+ @ApiOperation("淇敼浼︾悊瀹℃煡涓撳鎰忚")
/**
* 淇敼浼︾悊瀹℃煡涓撳鎰忚
*/
@@ -111,11 +111,11 @@
// @RepeatSubmit
public AjaxResult edit(@RequestBody ServiceEthicalreviewopinions serviceEthicalreviewopinions) {
boolean res=serviceEthicalreviewopinionsService.updateById(serviceEthicalreviewopinions);
- if(res&&serviceEthicalreviewopinions.getExpertType().equals("1")){
+ if(res&&serviceEthicalreviewopinions.getExpertType().equals("涓讳换濮斿憳")&&serviceEthicalreviewopinions.getReceiveStatus().equals("5")){
QueryWrapper<ServiceEthicalreviewinitiate> ethicalreviewinitiateQueryWrapper=new QueryWrapper<>();
ethicalreviewinitiateQueryWrapper.eq("id",serviceEthicalreviewopinions.getNitiateId());
ServiceEthicalreviewinitiate serviceEthicalreviewinitiate =new ServiceEthicalreviewinitiate();
- serviceEthicalreviewinitiate.setStatus("2");
+ serviceEthicalreviewinitiate.setStatus("3");
res=serviceEthicalreviewinitiateService.update(serviceEthicalreviewinitiate,ethicalreviewinitiateQueryWrapper);
}
return toAjax(res);
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceExternalpersonController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceExternalpersonController.java
index 57efec3..517c0ec 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceExternalpersonController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceExternalpersonController.java
@@ -8,6 +8,8 @@
import com.ruoyi.project.domain.BaseOnlyvalue;
import com.ruoyi.project.service.IBaseOnlyvalueService;
import com.ruoyi.web.controller.common.OnlyValueCommon;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.CollectionUtils;
@@ -36,6 +38,7 @@
* @date 2021-11-24
*/
@RestController
+@Api(description = "澶栧洿鍗曚綅浜哄憳",tags={"澶栧洿鍗曚綅浜哄憳"})
@RequestMapping("/project/externalperson")
public class ServiceExternalpersonController extends BaseController {
@Autowired
@@ -47,6 +50,7 @@
@Autowired
private OnlyValueCommon onlyValueCommon;
+ @ApiOperation("鏌ヨ澶栧洿鍗曚綅浜哄憳鍒楄〃")
/**
* 鏌ヨ澶栧洿鍗曚綅浜哄憳鍒楄〃
*/
@@ -59,6 +63,7 @@
return getDataTable(list);
}
+ @ApiOperation("瀵煎嚭澶栧洿鍗曚綅浜哄憳鍒楄〃")
/**
* 瀵煎嚭澶栧洿鍗曚綅浜哄憳鍒楄〃
*/
@@ -71,6 +76,7 @@
return util.exportExcel(list, "澶栧洿鍗曚綅浜哄憳鏁版嵁");
}
+ @ApiOperation("鑾峰彇澶栧洿鍗曚綅浜哄憳璇︾粏淇℃伅")
/**
* 鑾峰彇澶栧洿鍗曚綅浜哄憳璇︾粏淇℃伅
*/
@@ -80,6 +86,7 @@
return AjaxResult.success(serviceExternalpersonService.getById(id));
}
+ @ApiOperation("鏂板澶栧洿鍗曚綅浜哄憳")
/**
* 鏂板澶栧洿鍗曚綅浜哄憳
*/
@@ -97,6 +104,7 @@
return AjaxResult.success(serviceExternalperson);
}
+ @ApiOperation("淇敼澶栧洿鍗曚綅浜哄憳")
/**
* 淇敼澶栧洿鍗曚綅浜哄憳
*/
@@ -108,6 +116,7 @@
return toAjax(serviceExternalpersonService.updateById(serviceExternalperson));
}
+ @ApiOperation("鍒犻櫎澶栧洿鍗曚綅浜哄憳")
/**
* 鍒犻櫎澶栧洿鍗曚綅浜哄憳
*/
@@ -118,7 +127,7 @@
return toAjax(serviceExternalpersonService.removeByIds(Arrays.asList(ids)));
}
-
+ @ApiOperation("鑾峰彇澶栧洿鍗曚綅浜哄憳璇︾粏淇℃伅")
/**
* 鑾峰彇澶栧洿鍗曚綅浜哄憳璇︾粏淇℃伅
*/
diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index a294161..3b05225 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -99,7 +99,7 @@
logic-delete-value: 1 # 閫昏緫宸插垹闄ゅ��(榛樿涓� 1)
logic-not-delete-value: 0 # 閫昏緫鏈垹闄ゅ��(榛樿涓� 0)
# update-strategy: IGNORED #蹇界暐涓虹┖
-
+ call-setters-on-nulls: true
# PageHelper鍒嗛〉鎻掍欢
#pagehelper:
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceEthicalreviewopinions.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceEthicalreviewopinions.java
index 96da019..98650be 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceEthicalreviewopinions.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceEthicalreviewopinions.java
@@ -158,5 +158,9 @@
@ApiModelProperty("涓撳绫诲瀷0鏅��1涓撳")
@Excel(name = "涓撳绫诲瀷0鏅��1涓撳")
private String expertType;
+
+ @ApiModelProperty("绛惧悕")
+ @Excel(name = "绛惧悕")
+ private String sigin;
}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/EthicalReviewVO.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/EthicalReviewVO.java
index b0b20a3..01a32db 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/EthicalReviewVO.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/EthicalReviewVO.java
@@ -642,6 +642,8 @@
@Excel(name = "浼︾悊瀹℃煡id")
private String nitiateId;
-
+ @ApiModelProperty("绛惧悕")
+ @Excel(name = "绛惧悕")
+ private String sigin;
}
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceEthicalreviewinitiateMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceEthicalreviewinitiateMapper.xml
index 9f3d193..40b1142 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceEthicalreviewinitiateMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceEthicalreviewinitiateMapper.xml
@@ -102,7 +102,7 @@
se.expert_name as expertName,
se.expert_opinion as expertOpinion,
se.expert_time as expertTime,
- se.status as status,
+ ifnull(se.status,0) as status,
se.file_patch as filePatch,
se.sigin
FROM
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceEthicalreviewopinionsMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceEthicalreviewopinionsMapper.xml
index b2c83d7..d925f82 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceEthicalreviewopinionsMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceEthicalreviewopinionsMapper.xml
@@ -137,7 +137,8 @@
service_ethicalreviewopinions.organ_type as organ_type,
service_ethicalreviewopinions.ConclusionOrder as conclusionorder,
service_ethicalreviewopinions.nitiate_id as nitiateId,
- service_ethicalreviewopinions.expert_no as expertNo
+ service_ethicalreviewopinions.expert_no as expertNo,
+ service_ethicalreviewopinions.sigin as sigin
FROM service_donatebaseinfo
LEFT JOIN service_ethicalreviewopinions
ON service_donatebaseinfo.ID = service_ethicalreviewopinions.InfoID
--
Gitblit v1.9.3