From 4d7b4d226168bbb40fcc6910a73f39a82f85776f Mon Sep 17 00:00:00 2001
From: sinake <sinake1@qq.com>
Date: 星期二, 26 五月 2026 11:05:07 +0800
Subject: [PATCH] 新增七大步骤所有附件列表接口
---
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatebaseinfoServiceImpl.java | 81 +++++++++++++++++++++++++++++++++++-----
1 files changed, 71 insertions(+), 10 deletions(-)
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatebaseinfoServiceImpl.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatebaseinfoServiceImpl.java
index 3605a75..96e05bb 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatebaseinfoServiceImpl.java
+++ b/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;
@@ -304,6 +310,7 @@
donatebaseinfo.put("createtime", DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", serviceDonatebaseinfo.getCreateTime()));
donatebaseinfo.put("updatetime", serviceDonatebaseinfo.getUpdateTime() != null ? DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", serviceDonatebaseinfo.getUpdateTime()) : "");
donatebaseinfo.put("createperson", null);
+ donatebaseinfo.put("state",StringUtils.nullTo1(serviceDonatebaseinfo.getRecordstate()));
if (StringUtils.isNotBlank(serviceDonatebaseinfo.getCreateBy())) {
SysUser sysUser = sysUserMapper.selectUserByUserName(serviceDonatebaseinfo.getCreateBy());
if (!ObjectUtils.isEmpty(sysUser)) {
@@ -333,6 +340,7 @@
medicalevaluation.put("createtime", DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", serviceMedicalevaluations.get(0).getCreateTime()));
medicalevaluation.put("updatetime", serviceMedicalevaluations.get(0).getUpdateTime() != null ? DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", serviceMedicalevaluations.get(0).getUpdateTime()) : null);
medicalevaluation.put("createperson", null);
+ medicalevaluation.put("state", StringUtils.nullTo1(StringUtils.nullTo1(serviceMedicalevaluations.get(0).getAssessState())));
if (StringUtils.isNotBlank(serviceMedicalevaluations.get(0).getCreateBy())) {
SysUser sysUser = sysUserMapper.selectUserByUserName(serviceMedicalevaluations.get(0).getCreateBy());
if (!ObjectUtils.isEmpty(sysUser)) {
@@ -365,6 +373,7 @@
relativesconfirmation.put("createtime", DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", serviceRelativesconfirmations.get(0).getCreateTime()));
relativesconfirmation.put("updatetime", serviceRelativesconfirmations.get(0).getUpdateTime() != null ? DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", serviceRelativesconfirmations.get(0).getUpdateTime()) : "");
relativesconfirmation.put("createperson", null);
+ relativesconfirmation.put("state", StringUtils.nullTo1(serviceRelativesconfirmations.get(0).getState()));
if (StringUtils.isNotBlank(serviceRelativesconfirmations.get(0).getCreateBy())) {
SysUser sysUser = sysUserMapper.selectUserByUserName(serviceRelativesconfirmations.get(0).getCreateBy());
if (!ObjectUtils.isEmpty(sysUser)) {
@@ -397,6 +406,7 @@
donateflowcharts.put("createtime", DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", serviceEthicalreviewopinionsList.get(0).getCreateTime()));
donateflowcharts.put("updatetime", serviceEthicalreviewopinionsList.get(0).getUpdateTime() != null ? DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", serviceEthicalreviewopinionsList.get(0).getUpdateTime()) : "");
donateflowcharts.put("createperson", null);
+ donateflowcharts.put("state", StringUtils.nullTo1(serviceEthicalreviewopinionsList.get(0).getReceiveStatus()));
if (StringUtils.isNotBlank(serviceEthicalreviewopinionsList.get(0).getCreateBy())) {
SysUser sysUser = sysUserMapper.selectUserByUserName(serviceEthicalreviewopinionsList.get(0).getCreateBy());
if (!ObjectUtils.isEmpty(sysUser)) {
@@ -420,7 +430,7 @@
map1.setDonateflowcharts(donateflowcharts);
//灏佽鍣ㄥ畼鍒嗛厤
- Map<String, String> donateorgansService = new HashMap<>();
+ Map<String, Object> donateorgansService = new HashMap<>();
// if (serviceDonatebaseinfo.getWorkflow() >= 4) {
ServiceDonateorgan serviceDonateorgan = new ServiceDonateorgan();
serviceDonateorgan.setInfoid(id);
@@ -429,8 +439,8 @@
if (!CollectionUtils.isEmpty(serviceDonateorgans)) {
donateorgansService.put("createtime", DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", serviceDonateorgans.get(0).getCreateTime()));
donateorgansService.put("updatetime", serviceDonateorgans.get(0).getUpdateTime() != null ? DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", serviceDonateorgans.get(0).getUpdateTime()) : "");
-
donateorgansService.put("createperson", null);
+ donateorgansService.put("state", StringUtils.nullTo1(serviceDonateorgans.get(0).getAllocationstatus()));
if (StringUtils.isNotBlank(serviceDonateorgans.get(0).getCreateBy())) {
SysUser sysUser = sysUserMapper.selectUserByUserName(serviceDonateorgans.get(0).getCreateBy());
if (!ObjectUtils.isEmpty(sysUser)) {
@@ -460,8 +470,8 @@
if (!ObjectUtils.isEmpty(serviceDonationwitness)) {
donationwitness.put("createtime", DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", serviceDonationwitness.getCreateTime()));
donationwitness.put("updatetime", serviceDonationwitness.getUpdateTime() != null ? DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", serviceDonationwitness.getUpdateTime()) : "");
-
donationwitness.put("createperson", null);
+ donationwitness.put("state", StringUtils.nullTo1(serviceDonationwitness.getWitnessState()));
if (StringUtils.isNotBlank(serviceDonationwitness.getCreateBy())) {
SysUser sysUser = sysUserMapper.selectUserByUserName(serviceDonationwitness.getCreateBy());
if (!ObjectUtils.isEmpty(sysUser)) {
@@ -493,8 +503,8 @@
if (!CollectionUtils.isEmpty(serviceDonatecompletioninfos)) {
donatecompletioninfo.put("createtime", DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", serviceDonatecompletioninfos.get(0).getCreateTime()));
donatecompletioninfo.put("updatetime", serviceDonatecompletioninfos.get(0).getUpdateTime() != null ? DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", serviceDonatecompletioninfos.get(0).getUpdateTime()) : "");
-
donatecompletioninfo.put("createperson", null);
+ donatecompletioninfo.put("state", StringUtils.nullTo1(serviceDonatecompletioninfos.get(0).getCompleteState()));
if (StringUtils.isNotBlank(serviceDonatecompletioninfos.get(0).getCreateBy())) {
SysUser sysUser = sysUserMapper.selectUserByUserName(serviceDonatecompletioninfos.get(0).getCreateBy());
if (!ObjectUtils.isEmpty(sysUser)) {
@@ -524,8 +534,8 @@
if(donatemaintenanceEntityList.size()>0){
donatemaintenance.put("createtime", DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", donatemaintenanceEntityList.get(0).getCreateTime()));
donatemaintenance.put("updatetime", donatemaintenanceEntityList.get(0).getUpdateTime() != null ? DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", donatemaintenanceEntityList.get(0).getUpdateTime()) : "");
-
donatemaintenance.put("createperson", null);
+ donatemaintenance.put("state", StringUtils.nullTo1(donatemaintenanceEntityList.get(0).getState()));
if (StringUtils.isNotBlank(donatemaintenanceEntityList.get(0).getCreateBy())) {
SysUser sysUser = sysUserMapper.selectUserByUserName(donatemaintenanceEntityList.get(0).getCreateBy());
if (!ObjectUtils.isEmpty(sysUser)) {
@@ -552,8 +562,8 @@
if(serviceDeathinfoList.size()>0){
deathinfo.put("createtime", DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", serviceDeathinfoList.get(0).getCreateTime()));
deathinfo.put("updatetime", serviceDeathinfoList.get(0).getUpdateTime() != null ? DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", donatemaintenanceEntityList.get(0).getUpdateTime()) : "");
-
deathinfo.put("createperson", null);
+ deathinfo.put("state", StringUtils.nullTo1(serviceDeathinfoList.get(0).getState()));
if (StringUtils.isNotBlank(serviceDeathinfoList.get(0).getCreateBy())) {
SysUser sysUser = sysUserMapper.selectUserByUserName(serviceDeathinfoList.get(0).getCreateBy());
if (!ObjectUtils.isEmpty(sysUser)) {
@@ -628,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;
+ }
}
--
Gitblit v1.9.3