From c121dc8d2d5b56c17efe7e53e7ef3505387169c7 Mon Sep 17 00:00:00 2001
From: sinake <sinake1@qq.com>
Date: 星期四, 21 五月 2026 15:27:43 +0800
Subject: [PATCH] 转运附件数据不对
---
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceEthicalreviewopinionsServiceImpl.java | 113 +++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 102 insertions(+), 11 deletions(-)
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 1d5aaab..3fe36f9 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
@@ -6,6 +6,7 @@
import java.util.List;
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.domain.entity.SysRole;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.utils.DateUtils;
@@ -13,6 +14,8 @@
import com.ruoyi.project.common.CalculateDateUtils;
import com.ruoyi.project.domain.ServiceDonationwitness;
import com.ruoyi.project.domain.vo.EthicalReviewVO;
+import com.ruoyi.project.domain.vo.EthicalreviewopinionsStateTotalVO;
+import com.ruoyi.project.domain.vo.EthicalreviewopinionsTotalVO;
import com.ruoyi.project.domain.vo.MedicalEvaluationVO;
import com.ruoyi.project.mapper.ServiceDonationwitnessMapper;
import lombok.extern.slf4j.Slf4j;
@@ -65,6 +68,9 @@
if (StringUtils.isNotBlank(serviceEthicalreviewopinions.getExpertopinion())) {
wrappers.eq(ServiceEthicalreviewopinions::getExpertopinion, serviceEthicalreviewopinions.getExpertopinion());
}
+ if (StringUtils.isNotBlank(serviceEthicalreviewopinions.getCaseNo())) {
+ wrappers.eq(ServiceEthicalreviewopinions::getCaseNo, serviceEthicalreviewopinions.getCaseNo());
+ }
if (serviceEthicalreviewopinions.getExpertconclusion() != null) {
wrappers.eq(ServiceEthicalreviewopinions::getExpertconclusion, serviceEthicalreviewopinions.getExpertconclusion());
}
@@ -80,23 +86,89 @@
if (serviceEthicalreviewopinions.getConclusionorder() != null) {
wrappers.eq(ServiceEthicalreviewopinions::getConclusionorder, serviceEthicalreviewopinions.getConclusionorder());
}
+ if (serviceEthicalreviewopinions.getSendType() != null) {
+ wrappers.eq(ServiceEthicalreviewopinions::getSendType, serviceEthicalreviewopinions.getSendType());
+ }
+ if (serviceEthicalreviewopinions.getReceiveStatus() != null) {
+ wrappers.eq(ServiceEthicalreviewopinions::getReceiveStatus, serviceEthicalreviewopinions.getReceiveStatus());
+ }
+ if (StringUtils.isNotEmpty(serviceEthicalreviewopinions.getDeptCode())) {
+ wrappers.eq(ServiceEthicalreviewopinions::getDeptCode, serviceEthicalreviewopinions.getDeptCode());
+ }
+ if (StringUtils.isNotEmpty(serviceEthicalreviewopinions.getDeptName())) {
+ wrappers.eq(ServiceEthicalreviewopinions::getDeptName, serviceEthicalreviewopinions.getDeptName());
+ }
+ if (StringUtils.isNotEmpty(serviceEthicalreviewopinions.getOrganType())) {
+ wrappers.eq(ServiceEthicalreviewopinions::getOrganType, serviceEthicalreviewopinions.getOrganType());
+ }
return this.list(wrappers);
}
+
+
+ @Override
+ public Page<ServiceEthicalreviewopinions> queryListByPage(ServiceEthicalreviewopinions serviceEthicalreviewopinions) {
+ LambdaQueryWrapper<ServiceEthicalreviewopinions> wrappers = Wrappers.lambdaQuery();
+ if (serviceEthicalreviewopinions.getInfoid() != null) {
+ wrappers.eq(ServiceEthicalreviewopinions::getInfoid, serviceEthicalreviewopinions.getInfoid());
+ }
+ if (StringUtils.isNotBlank(serviceEthicalreviewopinions.getDonorno())) {
+ wrappers.eq(ServiceEthicalreviewopinions::getDonorno, serviceEthicalreviewopinions.getDonorno());
+ }
+ if (StringUtils.isNotBlank(serviceEthicalreviewopinions.getExpertopinion())) {
+ wrappers.eq(ServiceEthicalreviewopinions::getExpertopinion, serviceEthicalreviewopinions.getExpertopinion());
+ }
+ if (StringUtils.isNotBlank(serviceEthicalreviewopinions.getCaseNo())) {
+ wrappers.eq(ServiceEthicalreviewopinions::getCaseNo, serviceEthicalreviewopinions.getCaseNo());
+ }
+ if (serviceEthicalreviewopinions.getExpertconclusion() != null) {
+ wrappers.eq(ServiceEthicalreviewopinions::getExpertconclusion, serviceEthicalreviewopinions.getExpertconclusion());
+ }
+ if (StringUtils.isNotBlank(serviceEthicalreviewopinions.getExpertname())) {
+ wrappers.like(ServiceEthicalreviewopinions::getExpertname, serviceEthicalreviewopinions.getExpertname());
+ }
+ if (serviceEthicalreviewopinions.getConclusiontime() != null) {
+ wrappers.eq(ServiceEthicalreviewopinions::getConclusiontime, serviceEthicalreviewopinions.getConclusiontime());
+ }
+ if (StringUtils.isNotBlank(serviceEthicalreviewopinions.getConclusionannex())) {
+ wrappers.eq(ServiceEthicalreviewopinions::getConclusionannex, serviceEthicalreviewopinions.getConclusionannex());
+ }
+ if (serviceEthicalreviewopinions.getConclusionorder() != null) {
+ wrappers.eq(ServiceEthicalreviewopinions::getConclusionorder, serviceEthicalreviewopinions.getConclusionorder());
+ }
+ if (serviceEthicalreviewopinions.getSendType() != null) {
+ wrappers.eq(ServiceEthicalreviewopinions::getSendType, serviceEthicalreviewopinions.getSendType());
+ }
+ if (serviceEthicalreviewopinions.getReceiveStatus() != null) {
+ wrappers.eq(ServiceEthicalreviewopinions::getReceiveStatus, serviceEthicalreviewopinions.getReceiveStatus());
+ }
+ if (StringUtils.isNotEmpty(serviceEthicalreviewopinions.getDeptCode())) {
+ wrappers.eq(ServiceEthicalreviewopinions::getDeptCode, serviceEthicalreviewopinions.getDeptCode());
+ }
+ if (StringUtils.isNotEmpty(serviceEthicalreviewopinions.getDeptName())) {
+ wrappers.eq(ServiceEthicalreviewopinions::getDeptName, serviceEthicalreviewopinions.getDeptName());
+ }
+ 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);
+ List<ServiceEthicalreviewopinions> serviceDonateorganBaseList = serviceEthicalreviewopinionsMapper.selectPage(page, wrappers).getRecords();
+
+ return page.setRecords(serviceDonateorganBaseList);
+ }
+
@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) {
@@ -127,4 +199,23 @@
return ethicalReviewVOS;
}
+ public List<EthicalreviewopinionsTotalVO> expertTotal(String expertNo) {
+
+ return serviceEthicalreviewopinionsMapper.expertTotal(expertNo);
+ }
+
+ public Integer updateTimeOut() {
+ return serviceEthicalreviewopinionsMapper.updateTimeOut();
+ }
+
+ public List<EthicalreviewopinionsStateTotalVO> stateTotal(String expertNo) {
+
+ return serviceEthicalreviewopinionsMapper.stateTotal(expertNo);
+ }
+
+ public EthicalreviewopinionsStateTotalVO stateTotalAll(String nitiateId) {
+
+ return serviceEthicalreviewopinionsMapper.stateTotalAll(nitiateId);
+ }
+
}
--
Gitblit v1.9.3