伦理审查基本信息集合新增附件

sinake

8 小时以前 c9cf721bb193b89083cddb8a8a92e46ca3d95cc8

伦理审查基本信息集合新增附件

 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();
    }

    /**

 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;
}


 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;

}


 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