From 71208807c939f9fabb829725bc8365fd4089250e Mon Sep 17 00:00:00 2001
From: sinake <sinake1@qq.com>
Date: 星期四, 14 五月 2026 14:27:50 +0800
Subject: [PATCH] 伦理审查专家新增获取伦理审查专家接收、获取伦理审查专家数量、专家统计详情、专家类型、伦理审查id、专家编号
---
ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceEthicalreviewinitiate.java | 4 +
ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceEthicalreviewopinionsMapper.java | 2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceEthicalreviewopinionsController.java | 43 ++++++++--
ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceEthicalreviewopinions.java | 33 +++++++
ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/EthicalReviewVO.java | 26 ++++++
ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceEthicalreviewopinionsService.java | 2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceEthicalreviewinitiateController.java | 28 +++++++
ruoyi-project/src/main/resources/mapper/project/ServiceEthicalreviewopinionsMapper.xml | 22 +++--
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceEthicalreviewopinionsServiceImpl.java | 27 +++---
9 files changed, 151 insertions(+), 36 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 0804f98..5eb4a11 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
@@ -1,5 +1,6 @@
package com.ruoyi.web.controller.project;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.annotation.RepeatSubmit;
import com.ruoyi.common.annotation.UniqueCheck;
@@ -16,6 +17,7 @@
import com.ruoyi.project.service.IServiceEthicalreviewopinionsService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.ObjectUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
@@ -109,6 +111,10 @@
public AjaxResult add(@RequestBody ServiceEthicalreviewinitiate serviceEthicalreviewinitiate) {
boolean result=serviceEthicalreviewinitiateService.save(serviceEthicalreviewinitiate);
if (result) {
+ for(ServiceEthicalreviewopinions row: serviceEthicalreviewinitiate.getEthicalreviewopinionsList()){
+ row.setNitiateId(serviceEthicalreviewinitiate.getId());
+ serviceEthicalreviewopinionsService.save(row);
+ }
return AjaxResult.success(serviceEthicalreviewinitiate.getId());
} else
return AjaxResult.error();
@@ -140,4 +146,26 @@
public AjaxResult remove(@PathVariable Long[] ids) {
return toAjax(serviceEthicalreviewinitiateService.removeByIds(Arrays.asList(ids)));
}
+
+ /**
+ * 淇敼浼︾悊瀹℃煡鍙戣捣
+ */
+ @ApiOperation("浼︾悊瀹℃煡缁堟")
+ @GetMapping("/stop")
+ public AjaxResult stop(long id) {
+ QueryWrapper<ServiceEthicalreviewinitiate> ethicalreviewinitiateQueryWrapper=new QueryWrapper<>();
+ ethicalreviewinitiateQueryWrapper.eq("id",id);
+ ServiceEthicalreviewinitiate serviceEthicalreviewinitiate =new ServiceEthicalreviewinitiate();
+ serviceEthicalreviewinitiate.setStatus("2");
+ boolean result=serviceEthicalreviewinitiateService.update(serviceEthicalreviewinitiate,ethicalreviewinitiateQueryWrapper);
+ if (result) {
+ QueryWrapper<ServiceEthicalreviewopinions> ethicalreviewopinionsWrapper=new QueryWrapper<>();
+ ethicalreviewopinionsWrapper.eq("nitiate_id",id);
+ ServiceEthicalreviewopinions serviceEthicalreviewopinions =new ServiceEthicalreviewopinions();
+ serviceEthicalreviewopinions.setReceiveStatus("5");
+ serviceEthicalreviewopinionsService.update(serviceEthicalreviewopinions,ethicalreviewopinionsWrapper);
+ 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 a8d120e..34c95fd 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
@@ -13,9 +13,13 @@
import com.ruoyi.common.utils.PageUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.project.domain.ServiceDonateorganBase;
+import com.ruoyi.project.domain.ServiceEthicalreviewinitiate;
import com.ruoyi.project.domain.ServiceEthicalreviewopinions;
import com.ruoyi.project.domain.vo.EthicalReviewVO;
+import com.ruoyi.project.domain.vo.EthicalreviewopinionsTotalVO;
+import com.ruoyi.project.service.IServiceEthicalreviewinitiateService;
import com.ruoyi.project.service.IServiceEthicalreviewopinionsService;
+import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
@@ -34,20 +38,27 @@
*/
@RestController
@RequestMapping("/project/ethicalreviewopinions")
+@Api(description = "浼︾悊瀹℃煡涓撳鎰忚",tags={"浼︾悊瀹℃煡涓撳鎰忚"})
public class ServiceEthicalreviewopinionsController extends BaseController {
@Autowired
private IServiceEthicalreviewopinionsService serviceEthicalreviewopinionsService;
+ @Autowired
+ private IServiceEthicalreviewinitiateService serviceEthicalreviewinitiateService;
+
+ @ApiOperation("鏌ヨ浼︾悊瀹℃煡涓撳鎰忚鍒楄〃")
/**
* 鏌ヨ浼︾悊瀹℃煡涓撳鎰忚鍒楄〃
*/
//// @PreAuthorize("@ss.hasPermi('project:ethicalreviewopinions:list')")
@GetMapping("/list")
public Map<String, Object> list(ServiceEthicalreviewopinions serviceEthicalreviewopinions) {
+ serviceEthicalreviewopinionsService.updateTimeOut();
Page<ServiceEthicalreviewopinions> list = serviceEthicalreviewopinionsService.queryListByPage(serviceEthicalreviewopinions);
return getDataTable(list.getRecords(), (int) list.getTotal());
}
+ @ApiOperation("鏌ヨ鎹愮尞淇℃伅浼︾悊瀹℃煡涓撳鎰忚鍒楄〃")
@GetMapping("/listnew")
public TableDataInfo listnew(EthicalReviewVO ethicalReviewVO) {
startPage();
@@ -68,6 +79,7 @@
// return util.exportExcel(list, "浼︾悊瀹℃煡涓撳鎰忚鏁版嵁");
// }
+ @ApiOperation("鑾峰彇浼︾悊瀹℃煡涓撳鎰忚璇︾粏淇℃伅")
/**
* 鑾峰彇浼︾悊瀹℃煡涓撳鎰忚璇︾粏淇℃伅
*/
@@ -77,17 +89,19 @@
return AjaxResult.success(serviceEthicalreviewopinionsService.getById(id));
}
+ @ApiOperation("鏂板浼︾悊瀹℃煡涓撳鎰忚")
/**
* 鏂板浼︾悊瀹℃煡涓撳鎰忚
*/
//// @PreAuthorize("@ss.hasPermi('project:ethicalreviewopinions:add')")
- @Log(title = "浼︾悊瀹℃煡涓撳鎰忚", businessType = BusinessType.INSERT)
+ @Log(title = "鏂板浼︾悊瀹℃煡涓撳鎰忚", businessType = BusinessType.INSERT)
@PostMapping("/add")
public AjaxResult add(@RequestBody ServiceEthicalreviewopinions serviceEthicalreviewopinions) {
boolean save = serviceEthicalreviewopinionsService.save(serviceEthicalreviewopinions);
return AjaxResult.success(serviceEthicalreviewopinions);
}
+ @ApiOperation("浼︾悊瀹℃煡涓撳鎰忚")
/**
* 淇敼浼︾悊瀹℃煡涓撳鎰忚
*/
@@ -96,9 +110,18 @@
@PostMapping("/edit")
// @RepeatSubmit
public AjaxResult edit(@RequestBody ServiceEthicalreviewopinions serviceEthicalreviewopinions) {
- return toAjax(serviceEthicalreviewopinionsService.updateById(serviceEthicalreviewopinions));
+ boolean res=serviceEthicalreviewopinionsService.updateById(serviceEthicalreviewopinions);
+ if(res&&serviceEthicalreviewopinions.getExpertType().equals("1")){
+ QueryWrapper<ServiceEthicalreviewinitiate> ethicalreviewinitiateQueryWrapper=new QueryWrapper<>();
+ ethicalreviewinitiateQueryWrapper.eq("id",serviceEthicalreviewopinions.getNitiateId());
+ ServiceEthicalreviewinitiate serviceEthicalreviewinitiate =new ServiceEthicalreviewinitiate();
+ serviceEthicalreviewinitiate.setStatus("2");
+ res=serviceEthicalreviewinitiateService.update(serviceEthicalreviewinitiate,ethicalreviewinitiateQueryWrapper);
+ }
+ return toAjax(res);
}
+ @ApiOperation("鍒犻櫎浼︾悊瀹℃煡涓撳鎰忚")
/**
* 鍒犻櫎浼︾悊瀹℃煡涓撳鎰忚
*/
@@ -114,9 +137,9 @@
*/
@ApiOperation("鑾峰彇浼︾悊瀹℃煡涓撳鏁伴噺")
@GetMapping(value = "/expertCount")
- public AjaxResult count(Integer InfoID) {
+ public AjaxResult count(Integer nitiateId) {
QueryWrapper<ServiceEthicalreviewopinions> ethicalreviewopinionsWrapper=new QueryWrapper<>();
- ethicalreviewopinionsWrapper.eq("InfoID",InfoID);
+ ethicalreviewopinionsWrapper.eq("nitiate_Id",nitiateId);
long count =serviceEthicalreviewopinionsService.count(ethicalreviewopinionsWrapper);
return AjaxResult.success(count);
}
@@ -124,13 +147,13 @@
/**
* 鑾峰彇浼︾悊瀹℃煡涓撳鎺ユ敹
*/
- @ApiOperation("鑾峰彇浼︾悊瀹℃煡涓撳鎺ユ敹")
+ @ApiOperation("鑾峰彇浼︾悊瀹℃煡涓撳鐘舵��")
@GetMapping("/receiveStatus")
- public AjaxResult receiveStatus(Integer InfoID,String DonorNo) {
+ public AjaxResult receiveStatus(Integer nitiateId,String expertNo,String receiveStatus) {
QueryWrapper<ServiceEthicalreviewopinions> ethicalreviewopinionsWrapper=new QueryWrapper<>();
- ethicalreviewopinionsWrapper.eq("InfoID",InfoID).eq("DonorNo",DonorNo);
+ ethicalreviewopinionsWrapper.eq("nitiate_Id",nitiateId).eq("expert_no",expertNo);
ServiceEthicalreviewopinions serviceEthicalreviewopinions =new ServiceEthicalreviewopinions();
- serviceEthicalreviewopinions.setReceiveStatus("1");
+ serviceEthicalreviewopinions.setReceiveStatus(receiveStatus);
return toAjax(serviceEthicalreviewopinionsService.update(serviceEthicalreviewopinions,ethicalreviewopinionsWrapper));
}
@@ -139,8 +162,8 @@
*/
@ApiOperation("涓撳缁熻璇︽儏")
@GetMapping(value = "/expertTotal")
- public AjaxResult expertTotal(String DonorNo) {
- return AjaxResult.success(serviceEthicalreviewopinionsService.expertTotal(DonorNo));
+ public List<EthicalreviewopinionsTotalVO> expertTotal(String expertNo) {
+ return serviceEthicalreviewopinionsService.expertTotal(expertNo);
}
}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceEthicalreviewinitiate.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceEthicalreviewinitiate.java
index 1577ac6..8a99e04 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceEthicalreviewinitiate.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceEthicalreviewinitiate.java
@@ -137,5 +137,9 @@
@ApiModelProperty("绛惧悕")
@Excel(name = "绛惧悕")
private String sigin;
+
+ @ApiModelProperty("绛惧悕")
+ @TableField(exist = false)
+ private List<ServiceEthicalreviewopinions> ethicalreviewopinionsList;
}
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 79e9e1f..96da019 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
@@ -31,6 +31,13 @@
private Long id;
/**
+ * 浼︾悊瀹℃煡id
+ */
+ @ApiModelProperty("浼︾悊瀹℃煡id")
+ @Excel(name = "浼︾悊瀹℃煡id")
+ private Long nitiateId;
+
+ /**
* 鍏宠仈service_donatebaseinfo琛ㄧ殑ID
*/
@ApiModelProperty("鍏宠仈service_donatebaseinfo琛ㄧ殑ID")
@@ -86,6 +93,10 @@
@Excel(name = "涓撳缁撹 瑙佸瓧鍏� sys_0_1 ")
private Long expertconclusion;
+ @ApiModelProperty("涓撳缂栧彿")
+ @Excel(name = "涓撳缂栧彿")
+ private String expertNo;
+
/**
* 涓撳鍚嶅瓧
*/
@@ -125,9 +136,27 @@
/**
* 鎺ユ敹鐘舵��
*/
- @ApiModelProperty("鎺ユ敹鐘舵��")
- @Excel(name = "鎺ユ敹鐘舵��")
+ @ApiModelProperty("鎺ユ敹鐘舵��0寰呮帴鏀�1鏈帴鏀�2宸叉帴鏀�3瓒呮椂4涓5瀹屾垚")
+ @Excel(name = "鎺ユ敹鐘舵��0寰呮帴鏀�1鏈帴鏀�2宸叉帴鏀�3瓒呮椂4涓5瀹屾垚")
private String receiveStatus;
+ /** 鍙戣捣鏃堕棿 */
+ @ApiModelProperty("鍙戣捣鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "鍙戣捣鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ private Date startTime;
+
+ /** 缁撴潫鏃堕棿 */
+ @ApiModelProperty("缁撴潫鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "缁撴潫鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ private Date endTime;
+
+ /**
+ * 鎺ユ敹鐘舵��
+ */
+ @ApiModelProperty("涓撳绫诲瀷0鏅��1涓撳")
+ @Excel(name = "涓撳绫诲瀷0鏅��1涓撳")
+ private String expertType;
}
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 532e61a..b0b20a3 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
@@ -571,6 +571,9 @@
@Excel(name = "涓撳缁撹 瑙佸瓧鍏� sys_0_1 ")
private Long expertconclusion;
+ @ApiModelProperty("涓撳缂栧彿")
+ @Excel(name = "涓撳缂栧彿")
+ private String expertNo;
/**
* 涓撳鍚嶅瓧
@@ -619,7 +622,26 @@
/**
* 鎺ユ敹鐘舵��
*/
- @ApiModelProperty("鎺ユ敹鐘舵��")
- @Excel(name = "鎺ユ敹鐘舵��")
+ @ApiModelProperty("鎺ユ敹鐘舵��0寰呮帴鏀�1鏈帴鏀�2宸叉帴鏀�3瓒呮椂4涓5瀹屾垚")
+ @Excel(name = "鎺ユ敹鐘舵��0寰呮帴鏀�1鏈帴鏀�2宸叉帴鏀�3瓒呮椂4涓5瀹屾垚")
private String receiveStatus;
+
+ /** 鍙戣捣鏃堕棿 */
+ @ApiModelProperty("鍙戣捣鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "鍙戣捣鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ private Date startTime;
+
+ /** 缁撴潫鏃堕棿 */
+ @ApiModelProperty("缁撴潫鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "缁撴潫鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ private Date endTime;
+
+ @ApiModelProperty("浼︾悊瀹℃煡id")
+ @Excel(name = "浼︾悊瀹℃煡id")
+ private String nitiateId;
+
+
+
}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceEthicalreviewopinionsMapper.java b/ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceEthicalreviewopinionsMapper.java
index 61619b2..da7d729 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceEthicalreviewopinionsMapper.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceEthicalreviewopinionsMapper.java
@@ -31,4 +31,6 @@
Integer countNumber(TimeVO timeVO);
List<EthicalreviewopinionsTotalVO> expertTotal(String DonorNo);
+
+ Integer updateTimeOut();
}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceEthicalreviewopinionsService.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceEthicalreviewopinionsService.java
index 6f5526f..9d33612 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceEthicalreviewopinionsService.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceEthicalreviewopinionsService.java
@@ -29,4 +29,6 @@
List<EthicalReviewVO> selectVOList(EthicalReviewVO ethicalReviewVO);
List<EthicalreviewopinionsTotalVO> expertTotal(String DonorNo);
+
+ Integer updateTimeOut();
}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceEthicalreviewopinionsServiceImpl.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceEthicalreviewopinionsServiceImpl.java
index 4c201f1..fd8be8e 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceEthicalreviewopinionsServiceImpl.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceEthicalreviewopinionsServiceImpl.java
@@ -149,7 +149,12 @@
if (StringUtils.isNotEmpty(serviceEthicalreviewopinions.getOrganType())) {
wrappers.eq(ServiceEthicalreviewopinions::getOrganType, serviceEthicalreviewopinions.getOrganType());
}
-
+ if (ObjectUtils.isNotEmpty(serviceEthicalreviewopinions.getNitiateId())) {
+ wrappers.eq(ServiceEthicalreviewopinions::getNitiateId, serviceEthicalreviewopinions.getNitiateId());
+ }
+ if (ObjectUtils.isNotEmpty(serviceEthicalreviewopinions.getExpertNo())) {
+ wrappers.eq(ServiceEthicalreviewopinions::getExpertNo, serviceEthicalreviewopinions.getExpertNo());
+ }
int currentPage = (serviceEthicalreviewopinions.getPageNum() == null || serviceEthicalreviewopinions.getPageNum() < 1) ? 1 : serviceEthicalreviewopinions.getPageNum();
int size = (serviceEthicalreviewopinions.getPageSize() == null || serviceEthicalreviewopinions.getPageSize() < 1) ? 10 : serviceEthicalreviewopinions.getPageSize();
Page<ServiceEthicalreviewopinions> page = new Page<>(currentPage, size);
@@ -162,17 +167,7 @@
@Override
public List<EthicalReviewVO> selectVOList(EthicalReviewVO ethicalReviewVO) {
- SysUser user = SecurityUtils.getLoginUser().getUser();
- List<SysRole> l = user.getRoles();
- Boolean b = false;
- for (SysRole r : l) {
- if (r.getRoleId().longValue() == 3) {
- b = true;
- }
- }
- if (b) {
- ethicalReviewVO.setReporterno(user.getUserName());
- }
+
List<EthicalReviewVO> ethicalReviewVOS = serviceEthicalreviewopinionsMapper.selectVOList(ethicalReviewVO);
for (EthicalReviewVO ethicalReviewVO1 : ethicalReviewVOS) {
@@ -203,9 +198,13 @@
return ethicalReviewVOS;
}
- public List<EthicalreviewopinionsTotalVO> expertTotal(String DonorNo) {
+ public List<EthicalreviewopinionsTotalVO> expertTotal(String expertNo) {
- return serviceEthicalreviewopinionsMapper.expertTotal(DonorNo);
+ return serviceEthicalreviewopinionsMapper.expertTotal(expertNo);
+ }
+
+ public Integer updateTimeOut() {
+ return serviceEthicalreviewopinionsMapper.updateTimeOut();
}
}
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceEthicalreviewopinionsMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceEthicalreviewopinionsMapper.xml
index f327e28..b2c83d7 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceEthicalreviewopinionsMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceEthicalreviewopinionsMapper.xml
@@ -135,13 +135,12 @@
service_ethicalreviewopinions.dept_name as dept_name,
service_ethicalreviewopinions.dept_code as dept_code,
service_ethicalreviewopinions.organ_type as organ_type,
- service_ethicalreviewopinions.ConclusionOrder as conclusionorder
- FROM
- service_donatebaseinfo
- LEFT JOIN
- service_ethicalreviewopinions
- ON
- service_donatebaseinfo.ID = service_ethicalreviewopinions.InfoID
+ service_ethicalreviewopinions.ConclusionOrder as conclusionorder,
+ service_ethicalreviewopinions.nitiate_id as nitiateId,
+ service_ethicalreviewopinions.expert_no as expertNo
+ FROM service_donatebaseinfo
+ LEFT JOIN service_ethicalreviewopinions
+ ON service_donatebaseinfo.ID = service_ethicalreviewopinions.InfoID
LEFT JOIN base_organization ON
base_organization.OrganizationID = service_donatebaseinfo.TreatmentHospitalNo
@@ -172,6 +171,8 @@
<if test="city != null and city != ''">and `base_organization`.`City` = #{city}</if>
<if test="fcid != null ">and `service_ethicalreviewopinions`.`ID` = #{fcid}</if>
<if test="workflow != null ">and `service_donatebaseinfo`.`workflow` = #{workflow}</if>
+ <if test="nitiateId != null ">and `service_ethicalreviewopinions`.`nitiate_id` = #{nitiateId}</if>
+ <if test="expertNo != null ">and `service_ethicalreviewopinions`.`expert_no` = #{expertNo}</if>
</where>
order by `service_ethicalreviewopinions`.`ConclusionTime` desc
@@ -196,10 +197,15 @@
FROM service_ethicalreviewopinions
<where>
- <if test="DonorNo != null ">DonorNo = #{DonorNo}</if>
+ <if test="expertNo != null ">expert_no = #{expertNo}</if>
</where>
GROUP BY receive_status,ExpertOpinion,ConclusionAnnex
</select>
+ <update id="updateTimeOut" >
+ UPDATE service_ethicalreviewopinions SET receive_status=0
+ WHERE end_time IS NOT NULL AND end_time <= NOW()
+ </update>
+
</mapper>
--
Gitblit v1.9.3