From c9cf721bb193b89083cddb8a8a92e46ca3d95cc8 Mon Sep 17 00:00:00 2001
From: sinake <sinake1@qq.com>
Date: 星期五, 24 四月 2026 15:35:15 +0800
Subject: [PATCH] 伦理审查基本信息集合新增附件
---
ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceEthicalreviewinitiate.java | 10 +++++++++-
ruoyi-project/src/main/java/com/ruoyi/project/domain/dto/ReviewInitiateBaseInfoDTO.java | 7 +++++++
ruoyi-project/src/main/resources/mapper/project/ServiceEthicalreviewinitiateMapper.xml | 4 +++-
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceEthicalreviewinitiateController.java | 14 ++++++++++++--
4 files changed, 31 insertions(+), 4 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 cd9f7ba..0804f98 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
@@ -8,10 +8,12 @@
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.PageUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.project.domain.ServiceEthicalreviewopinions;
import com.ruoyi.project.domain.dto.ReviewInitiateBaseInfoDTO;
import com.ruoyi.project.domain.vo.ReviewInitiateBaseInfoVO;
import com.ruoyi.project.domain.ServiceEthicalreviewinitiate;
import com.ruoyi.project.service.IServiceEthicalreviewinitiateService;
+import com.ruoyi.project.service.IServiceEthicalreviewopinionsService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
@@ -35,6 +37,8 @@
@Autowired
private IServiceEthicalreviewinitiateService serviceEthicalreviewinitiateService;
+ @Autowired
+ private IServiceEthicalreviewopinionsService serviceEthicalreviewopinionsService;
// /**
// * 鏌ヨ浼︾悊瀹℃煡鍙戣捣鍒楄〃
// */
@@ -85,7 +89,9 @@
@ApiOperation("鑾峰彇浼︾悊瀹℃煡鍙戣捣璇︾粏淇℃伅")
@GetMapping(value = "/getInfo/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id) {
- return AjaxResult.success(serviceEthicalreviewinitiateService.getById(id));
+ ServiceEthicalreviewinitiate serviceEthicalreviewinitiate= serviceEthicalreviewinitiateService.getById(id);
+
+ return AjaxResult.success(serviceEthicalreviewinitiate);
}
/**
@@ -117,7 +123,11 @@
@PostMapping("/edit")
@RepeatSubmit
public AjaxResult edit(@RequestBody ServiceEthicalreviewinitiate serviceEthicalreviewinitiate) {
- return toAjax(serviceEthicalreviewinitiateService.updateById(serviceEthicalreviewinitiate));
+ boolean result=serviceEthicalreviewinitiateService.updateById(serviceEthicalreviewinitiate);
+ if (result) {
+ return AjaxResult.success();
+ } else
+ return AjaxResult.error();
}
/**
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 85f6237..b863da7 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
@@ -1,6 +1,9 @@
package com.ruoyi.project.domain;
import java.util.Date;
+import java.util.List;
+
+import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
@@ -124,6 +127,11 @@
@Excel(name = "0锛氭柊寤�;1锛氬鏌ヤ腑;2锛氱粨鏉�")
private String status;
-
+ /**
+ * 闄勪欢澶氫釜;闅斿紑
+ */
+ @ApiModelProperty("闄勪欢澶氫釜;闅斿紑")
+ @Excel(name = "闄勪欢澶氫釜;闅斿紑")
+ private String filePatch;
}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/dto/ReviewInitiateBaseInfoDTO.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/dto/ReviewInitiateBaseInfoDTO.java
index 7b7ca1c..752b7c9 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/dto/ReviewInitiateBaseInfoDTO.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/dto/ReviewInitiateBaseInfoDTO.java
@@ -161,5 +161,12 @@
@Excel(name = "鐘舵�侊細0锛氭柊寤�;1锛氬鏌ヤ腑;2锛氱粨鏉�")
private String status;
+ /**
+ * 闄勪欢澶氫釜;闅斿紑
+ */
+ @ApiModelProperty("闄勪欢澶氫釜;闅斿紑")
+ @Excel(name = "闄勪欢澶氫釜;闅斿紑")
+ private String filePatch;
+
}
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceEthicalreviewinitiateMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceEthicalreviewinitiateMapper.xml
index 7d40f97..ee257e0 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceEthicalreviewinitiateMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceEthicalreviewinitiateMapper.xml
@@ -27,6 +27,7 @@
<result property="expertTime" column="expert_time"/>
<result property="expertType" column="expert_type"/>
<result property="status" column="status"/>
+ <result property="filePatch" column="file_patch"/>
</resultMap>
<sql id="selectServiceEthicalreviewinitiateVo">
@@ -101,7 +102,8 @@
se.expert_name as expertName,
se.expert_opinion as expertOpinion,
se.expert_time as expertTime,
- se.status as status
+ se.status as status,
+ se.file_patch as filePatch
FROM
service_donatebaseinfo sd
LEFT JOIN service_ethicalreviewinitiate se ON sd.ID = se.InfoID and sd.del_flag = 0
--
Gitblit v1.9.3