sinake
7 小时以前 4d7b4d226168bbb40fcc6910a73f39a82f85776f
新增七大步骤所有附件列表接口
已修改4个文件
已添加1个文件
116 ■■■■■ 文件已修改
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatebaseinfoController.java 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatecompletioninfoController.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/FileListVO.java 40 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceDonatebaseinfoService.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatebaseinfoServiceImpl.java 65 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatebaseinfoController.java
@@ -8,6 +8,7 @@
import com.ruoyi.common.constant.HttpStatus;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.Result;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
@@ -21,6 +22,7 @@
import com.ruoyi.project.domain.dto.DonatebaseinfoProgressDTO;
import com.ruoyi.project.domain.dto.ReviewInitiateBaseInfoDTO;
import com.ruoyi.project.domain.vo.DonatebaseinfoProgressVO;
import com.ruoyi.project.domain.vo.FileListVO;
import com.ruoyi.project.domain.vo.TimeVO;
import com.ruoyi.project.domain.vo.WorkFlowVO;
import com.ruoyi.project.service.IServiceDonatebaseinfoService;
@@ -1008,4 +1010,10 @@
        return serviceDonatebaseinfoService.getWorkFlow(id);
    }
    @ApiOperation("获取捐献工作流")
    @GetMapping(value = "/fileList/")
    public Result<FileListVO>  fileList(Long infoId) {
        return Result.success(serviceDonatebaseinfoService.fileList(infoId)) ;
    }
}
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatecompletioninfoController.java
@@ -494,4 +494,5 @@
        dataMap.put("WCRQ", sformat.format(donationCompletion.getCompletetime()) == null ? "" : sformat.format(donationCompletion.getCompletetime()));
    }
}
ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/FileListVO.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,40 @@
package com.ruoyi.project.domain.vo;
import com.ruoyi.project.domain.*;
import com.ruoyi.project.domain.entity.ServiceDonatemaintenanceEntity;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
import java.util.Map;
@Data
public class FileListVO {
    @ApiModelProperty("供者维护")
    List<ServiceDonatemaintenanceEntity> donatemaintenance;
    @ApiModelProperty("捐献确认")
    List<ServiceRelativesconfirmation> relativesconfirmation;
    @ApiModelProperty("医学评估")
    List<ServiceMedicalevaluationorgan> medicalevaluation;
    @ApiModelProperty("死亡判定")
    List<ServiceDeathinfo>   deathinfo;
    @ApiModelProperty("伦理审查")
    List<ServiceEthicalreviewinitiate> donateflowcharts;
    @ApiModelProperty("器官分配")
    List<ServiceDonateorganBase> donateorgans;
    @ApiModelProperty("器管获取")
    List<ServiceDonationwitness> donationwitness;
    @ApiModelProperty("器管利用")
    List<ServiceDonatecompletioninfo> donatecompletioninfo;
}
ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceDonatebaseinfoService.java
@@ -59,5 +59,7 @@
    WorkFlowVO getWorkFlow(Long id);
    FileListVO fileList(Long id);
}
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatebaseinfoServiceImpl.java
@@ -18,10 +18,7 @@
import com.ruoyi.project.domain.*;
import com.ruoyi.project.domain.dto.DonatebaseinfoProgressDTO;
import com.ruoyi.project.domain.entity.ServiceDonatemaintenanceEntity;
import com.ruoyi.project.domain.vo.DonatebaseinfoProgressVO;
import com.ruoyi.project.domain.vo.TimeVO;
import com.ruoyi.project.domain.vo.WorkFlowVO;
import com.ruoyi.project.domain.vo.countByRecordStateVO;
import com.ruoyi.project.domain.vo.*;
import com.ruoyi.project.mapper.*;
import com.ruoyi.project.service.*;
import com.ruoyi.system.mapper.SysUserMapper;
@@ -65,6 +62,9 @@
    private IServiceMedicalevaluationService serviceMedicalevaluationService;
    @Autowired
    private IServiceMedicalevaluationorganService serviceMedicalevaluationServiceorgan;
    @Autowired
    private IServiceRelativesconfirmationService serviceRelativesconfirmationService;
    @Autowired
@@ -74,10 +74,16 @@
    private IServiceEthicalreviewopinionsService iServiceEthicalreviewopinionsService;
    @Autowired
    private IServiceEthicalreviewinitiateService iServiceEthicalreviewinitiateService;
    @Autowired
    private IServiceOrganallocationService serviceOrganallocationService;
    @Autowired
    private IServiceDonateorganService serviceDonateorganService;
    @Autowired
    private IServiceDonateorganBaseService serviceDonateorganBaseService;
    @Autowired
    private IServiceDonationwitnessService serviceDonationwitnessService;
@@ -632,5 +638,56 @@
            wrappers.between(ServiceDonatebaseinfo::getReporttime, params.get("beginReporttime"), params.get("endReporttime"));
        }
    }
    public FileListVO fileList(Long infoId){
        FileListVO fileList=new FileListVO();
        //供者维护
        ServiceDonatemaintenanceEntity serviceDonatemaintenanceEntity=new ServiceDonatemaintenanceEntity();
        serviceDonatemaintenanceEntity.setInfoid(infoId);
        List<ServiceDonatemaintenanceEntity> donatemaintenanceEntityList= serviceDonatemaintenanceService.queryList(serviceDonatemaintenanceEntity).getRecords();
        fileList.setDonatemaintenance(donatemaintenanceEntityList);
        //捐献确认
        ServiceRelativesconfirmation serviceRelativesconfirmation = new ServiceRelativesconfirmation();
        serviceRelativesconfirmation.setInfoid(infoId);
        List<ServiceRelativesconfirmation> serviceRelativesconfirmations = serviceRelativesconfirmationService.queryList(serviceRelativesconfirmation);
        fileList.setRelativesconfirmation(serviceRelativesconfirmations);
        //医学评估
        ServiceMedicalevaluationorgan serviceMedicalevaluation = new ServiceMedicalevaluationorgan();
        serviceMedicalevaluation.setInfoid(infoId);
        List<ServiceMedicalevaluationorgan> serviceMedicalevaluations = serviceMedicalevaluationServiceorgan.queryList(serviceMedicalevaluation);
        fileList.setMedicalevaluation(serviceMedicalevaluations);
        //死亡判定
        ServiceDeathinfo serviceDeathinfo =new ServiceDeathinfo();
        serviceDeathinfo.setInfoid(infoId);
        List<ServiceDeathinfo> serviceDeathinfoList= serviceDeathinfoService.queryList(serviceDeathinfo).getRecords();
        fileList.setDeathinfo(serviceDeathinfoList);
        //伦理审查
        ServiceEthicalreviewinitiate serviceDonateflowchart = new ServiceEthicalreviewinitiate();
        serviceDonateflowchart.setInfoid(infoId);
        List<ServiceEthicalreviewinitiate> serviceEthicalreviewinitiateList = iServiceEthicalreviewinitiateService.queryList(serviceDonateflowchart);
        fileList.setDonateflowcharts(serviceEthicalreviewinitiateList);
        //器官分配
        ServiceDonateorganBase serviceDonateorgan = new ServiceDonateorganBase();
        serviceDonateorgan.setInfoid(infoId);
        List<ServiceDonateorganBase> serviceDonateorgans = serviceDonateorganBaseService.queryList(serviceDonateorgan).getRecords();
        fileList.setDonateorgans(serviceDonateorgans);
        //器管获取
        ServiceDonationwitness serviceDonationwitness=new ServiceDonationwitness();
        serviceDonationwitness.setInfoid(infoId);
        List<ServiceDonationwitness> serviceDonationwitnesss = serviceDonationwitnessService.queryList(serviceDonationwitness);
        fileList.setDonationwitness(serviceDonationwitnesss);
        //器管利用
        ServiceDonatecompletioninfo serviceDonatecompletioninfo = new ServiceDonatecompletioninfo();
        serviceDonatecompletioninfo.setInfoid(infoId);
        List<ServiceDonatecompletioninfo> serviceDonatecompletioninfos = serviceDonatecompletioninfoService.queryList(serviceDonatecompletioninfo);
        fileList.setDonatecompletioninfo(serviceDonatecompletioninfos);
        return  fileList;
    }
}