From 1fba8f84b6326b2f1d613ec02890386ad512f184 Mon Sep 17 00:00:00 2001
From: sinake <sinake1@qq.com>
Date: 星期六, 09 五月 2026 09:45:34 +0800
Subject: [PATCH] 青附院opo捐献亲属确认增加状态 青附院opo患者死亡信息增加状态 青附院opo供体维护记录增加状态
---
ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceRelativesconfirmation.java | 7 +
ruoyi-project/src/main/java/com/ruoyi/project/domain/dto/RelativeConfirmationBaseInfoDTO.java | 7 +
ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceDonatebaseinfoService.java | 7 -
ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/MaintenanceBaseInfoVO.java | 6 +
ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDeathinfo.java | 7 +
ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/WorkFlowVO.java | 72 ++++++++++++++
ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonatemaintenanceVO.java | 7 +
ruoyi-project/src/main/java/com/ruoyi/project/domain/entity/MaintenanceBaseInfoEntity.java | 7 +
ruoyi-project/src/main/java/com/ruoyi/project/domain/entity/ServiceDonatemaintenanceEntity.java | 7 +
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatebaseinfoServiceImpl.java | 110 ++++++++++++++++-----
ruoyi-project/src/main/resources/mapper/project/ServiceDeathinfoMapper.xml | 6
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatebaseinfoController.java | 5
ruoyi-project/src/main/resources/mapper/project/ServiceDonatemaintenanceMapper.xml | 3
ruoyi-project/src/main/resources/mapper/project/ServiceRelativesconfirmationMapper.xml | 3
ruoyi-project/src/main/java/com/ruoyi/project/domain/dto/DeathBaseInfoDTO.java | 7 +
ruoyi-project/src/main/java/com/ruoyi/project/domain/dto/MaintenanceBaseInfoDTO.java | 6 +
16 files changed, 230 insertions(+), 37 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatebaseinfoController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatebaseinfoController.java
index 76b8cab..69c64cd 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatebaseinfoController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatebaseinfoController.java
@@ -22,6 +22,7 @@
import com.ruoyi.project.domain.dto.ReviewInitiateBaseInfoDTO;
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.service.IServiceDonatebaseinfoService;
import com.ruoyi.project.service.IServiceDonationwitnessService;
import com.ruoyi.project.service.IServiceExternalpersonService;
@@ -1002,9 +1003,9 @@
*/
@ApiOperation("鑾峰彇鎹愮尞宸ヤ綔娴�")
@GetMapping(value = "/getWorkFlow/{id}")
- public AjaxResult getWorkFlow(@PathVariable("id") Long id) {
+ public WorkFlowVO getWorkFlow(@PathVariable("id") Long id) {
log.info("鑾峰彇鎹愮尞宸ヤ綔娴侊細{}", id);
- return AjaxResult.success(serviceDonatebaseinfoService.getWorkFlow(id));
+ return serviceDonatebaseinfoService.getWorkFlow(id);
}
}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDeathinfo.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDeathinfo.java
index 646e013..a7f5134 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDeathinfo.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDeathinfo.java
@@ -108,5 +108,12 @@
@ApiModelProperty("鎵╁睍")
@Excel(name = "鎵╁睍")
private String extContent;
+
+ /**
+ * 鐘舵��1寰呭埄鐢紝2杩涜涓紝3鎹愮尞瀹屾垚锛�4鏀惧純
+ */
+ @ApiModelProperty("鐘舵��1寰呭埄鐢紝2杩涜涓紝3鎹愮尞瀹屾垚锛�4鏀惧純")
+ @Excel(name = "鐘舵��1寰呭埄鐢紝2杩涜涓紝3鎹愮尞瀹屾垚锛�4鏀惧純")
+ private String state;
}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonatemaintenanceVO.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonatemaintenanceVO.java
index d046eb1..a6e15f1 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonatemaintenanceVO.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonatemaintenanceVO.java
@@ -81,5 +81,12 @@
@Excel(name = "椤圭洰缁存姢璇︽儏锛宩son缁撴瀯")
private JSONObject itemDesc;
+ /**
+ * 鐘舵��1寰呭埄鐢紝2杩涜涓紝3鎹愮尞瀹屾垚锛�4鏀惧純
+ */
+ @ApiModelProperty("鐘舵��1寰呭埄鐢紝2杩涜涓紝3鎹愮尞瀹屾垚锛�4鏀惧純")
+ @Excel(name = "鐘舵��1寰呭埄鐢紝2杩涜涓紝3鎹愮尞瀹屾垚锛�4鏀惧純")
+ private String state;
+
}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceRelativesconfirmation.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceRelativesconfirmation.java
index 2b37356..287dbe2 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceRelativesconfirmation.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceRelativesconfirmation.java
@@ -301,5 +301,12 @@
*/
@ApiModelProperty("浜插睘璇佷欢鍙�")
private String relativeidcardno;
+
+ /**
+ * 鐘舵��1寰呭埄鐢紝2杩涜涓紝3鎹愮尞瀹屾垚锛�4鏀惧純
+ */
+ @ApiModelProperty("鐘舵��1寰呭埄鐢紝2杩涜涓紝3鎹愮尞瀹屾垚锛�4鏀惧純")
+ @Excel(name = "鐘舵��1寰呭埄鐢紝2杩涜涓紝3鎹愮尞瀹屾垚锛�4鏀惧純")
+ private String state;
}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/dto/DeathBaseInfoDTO.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/dto/DeathBaseInfoDTO.java
index 05b60d2..58e1d03 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/dto/DeathBaseInfoDTO.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/dto/DeathBaseInfoDTO.java
@@ -204,5 +204,12 @@
@Excel(name = "鎵╁睍鍐呭")
private String extracontent;
+ /**
+ * 鐘舵��1寰呭埄鐢紝2杩涜涓紝3鎹愮尞瀹屾垚锛�4鏀惧純
+ */
+ @ApiModelProperty("鐘舵��1寰呭埄鐢紝2杩涜涓紝3鎹愮尞瀹屾垚锛�4鏀惧純")
+ @Excel(name = "鐘舵��1寰呭埄鐢紝2杩涜涓紝3鎹愮尞瀹屾垚锛�4鏀惧純")
+ private String state;
+
}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/dto/MaintenanceBaseInfoDTO.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/dto/MaintenanceBaseInfoDTO.java
index 6084343..95ec025 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/dto/MaintenanceBaseInfoDTO.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/dto/MaintenanceBaseInfoDTO.java
@@ -190,5 +190,11 @@
@Excel(name = "椤圭洰缁存姢璇︽儏锛宩son缁撴瀯")
private JSONObject itemDesc;
+ /**
+ * 鐘舵��1寰呭埄鐢紝2杩涜涓紝3鎹愮尞瀹屾垚锛�4鏀惧純
+ */
+ @ApiModelProperty("鐘舵��1寰呭埄鐢紝2杩涜涓紝3鎹愮尞瀹屾垚锛�4鏀惧純")
+ @Excel(name = "鐘舵��1寰呭埄鐢紝2杩涜涓紝3鎹愮尞瀹屾垚锛�4鏀惧純")
+ private String state;
}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/dto/RelativeConfirmationBaseInfoDTO.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/dto/RelativeConfirmationBaseInfoDTO.java
index 9a432ea..024cdc4 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/dto/RelativeConfirmationBaseInfoDTO.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/dto/RelativeConfirmationBaseInfoDTO.java
@@ -292,4 +292,11 @@
*/
@ApiModelProperty("浜插睘璇佷欢鍙�")
private String relativeidcardno;
+
+ /**
+ * 鐘舵��1寰呭埄鐢紝2杩涜涓紝3鎹愮尞瀹屾垚锛�4鏀惧純
+ */
+ @ApiModelProperty("鐘舵��1寰呭埄鐢紝2杩涜涓紝3鎹愮尞瀹屾垚锛�4鏀惧純")
+ @Excel(name = "鐘舵��1寰呭埄鐢紝2杩涜涓紝3鎹愮尞瀹屾垚锛�4鏀惧純")
+ private String state;
}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/entity/MaintenanceBaseInfoEntity.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/entity/MaintenanceBaseInfoEntity.java
index 7e2feda..8a77335 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/entity/MaintenanceBaseInfoEntity.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/entity/MaintenanceBaseInfoEntity.java
@@ -190,5 +190,12 @@
@Excel(name = "椤圭洰缁存姢璇︽儏锛宩son缁撴瀯")
private String itemDesc;
+ /**
+ * 鐘舵��1寰呭埄鐢紝2杩涜涓紝3鎹愮尞瀹屾垚锛�4鏀惧純
+ */
+ @ApiModelProperty("鐘舵��1寰呭埄鐢紝2杩涜涓紝3鎹愮尞瀹屾垚锛�4鏀惧純")
+ @Excel(name = "鐘舵��1寰呭埄鐢紝2杩涜涓紝3鎹愮尞瀹屾垚锛�4鏀惧純")
+ private String state;
+
}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/entity/ServiceDonatemaintenanceEntity.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/entity/ServiceDonatemaintenanceEntity.java
index fb34e17..dae89f3 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/entity/ServiceDonatemaintenanceEntity.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/entity/ServiceDonatemaintenanceEntity.java
@@ -82,5 +82,12 @@
@Excel(name = "椤圭洰缁存姢璇︽儏锛宩son缁撴瀯")
private String itemDesc;
+ /**
+ * 鐘舵��1寰呭埄鐢紝2杩涜涓紝3鎹愮尞瀹屾垚锛�4鏀惧純
+ */
+ @ApiModelProperty("鐘舵��1寰呭埄鐢紝2杩涜涓紝3鎹愮尞瀹屾垚锛�4鏀惧純")
+ @Excel(name = "鐘舵��1寰呭埄鐢紝2杩涜涓紝3鎹愮尞瀹屾垚锛�4鏀惧純")
+ private String state;
+
}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/MaintenanceBaseInfoVO.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/MaintenanceBaseInfoVO.java
index 2ae537c..96ae538 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/MaintenanceBaseInfoVO.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/MaintenanceBaseInfoVO.java
@@ -169,5 +169,11 @@
@Excel(name = "閮ㄩ棬鍚嶇О")
private String deptname;
+ /**
+ * 鐘舵��1寰呭埄鐢紝2杩涜涓紝3鎹愮尞瀹屾垚锛�4鏀惧純
+ */
+ @ApiModelProperty("鐘舵��1寰呭埄鐢紝2杩涜涓紝3鎹愮尞瀹屾垚锛�4鏀惧純")
+ @Excel(name = "鐘舵��1寰呭埄鐢紝2杩涜涓紝3鎹愮尞瀹屾垚锛�4鏀惧純")
+ private String state;
}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/WorkFlowVO.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/WorkFlowVO.java
new file mode 100644
index 0000000..8a36398
--- /dev/null
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/WorkFlowVO.java
@@ -0,0 +1,72 @@
+package com.ruoyi.project.domain.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Map;
+
+@Data
+public class WorkFlowVO {
+
+ /**
+ * 灏佽娼滃湪鎹愮尞鏁版嵁
+ */
+ @ApiModelProperty("灏佽娼滃湪鎹愮尞鏁版嵁")
+ Map<String, String> donatebaseinfo;
+
+ /**
+ * 灏佽鍖诲璇勪及
+ */
+ @ApiModelProperty("灏佽鍖诲璇勪及")
+ Map<String, String> medicalevaluation;
+
+
+ /**
+ * 灏佽鎹愮尞纭
+ */
+ @ApiModelProperty("灏佽鎹愮尞纭")
+ Map<String, String> relativesconfirmation;
+
+
+ /**
+ * 灏佽浼︾悊瀹℃煡
+ */
+ @ApiModelProperty("灏佽浼︾悊瀹℃煡")
+ Map<String, String> donateflowcharts;
+
+
+ /**
+ * 灏佽鍣ㄥ畼鍒嗛厤
+ */
+ @ApiModelProperty("灏佽鍣ㄥ畼鍒嗛厤")
+ Map<String, String> donateorgansService;
+
+
+ /**
+ * 灏佽鑾峰彇瑙佽瘉
+ */
+ @ApiModelProperty("灏佽鑾峰彇瑙佽瘉")
+ Map<String, String> donationwitness;
+
+
+ /**
+ * 灏佽瀹屾垚鐧昏
+ */
+ @ApiModelProperty("灏佽瀹屾垚鐧昏")
+ Map<String, String> donatecompletioninfo;
+
+ /**
+ * 渚涗綋缁存姢璁板綍
+ */
+ @ApiModelProperty("渚涗綋缁存姢璁板綍")
+ Map<String, String> donatemaintenance;
+
+
+ /**
+ * 鎮ｈ�呮浜′俊鎭�
+ */
+ @ApiModelProperty("鎮ｈ�呮浜′俊鎭�")
+ Map<String, String> deathinfo;
+
+
+}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceDonatebaseinfoService.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceDonatebaseinfoService.java
index a026c49..1a01100 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceDonatebaseinfoService.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceDonatebaseinfoService.java
@@ -7,10 +7,7 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.project.domain.ServiceDonatebaseinfo;
import com.ruoyi.project.domain.dto.DonatebaseinfoProgressDTO;
-import com.ruoyi.project.domain.vo.DonatebaseinfoProgressVO;
-import com.ruoyi.project.domain.vo.RelativeConfirmationBaseInfoVO;
-import com.ruoyi.project.domain.vo.TimeVO;
-import com.ruoyi.project.domain.vo.countByRecordStateVO;
+import com.ruoyi.project.domain.vo.*;
import org.apache.xmlbeans.impl.xb.xsdschema.Public;
/**
@@ -60,7 +57,7 @@
String getDonateNameById(Long infoid);
- Map<String, Object> getWorkFlow(Long id);
+ WorkFlowVO getWorkFlow(Long id);
}
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 3ec8b27..3605a75 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
@@ -17,8 +17,10 @@
import com.ruoyi.project.common.CalculateDateUtils;
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.mapper.*;
import com.ruoyi.project.service.*;
@@ -84,6 +86,10 @@
private IServiceDonatecompletioninfoService serviceDonatecompletioninfoService;
@Autowired
private SysUserMapper sysUserMapper;
+ @Autowired
+ IServiceDonatemaintenanceService serviceDonatemaintenanceService;
+ @Autowired
+ IServiceDeathinfoService serviceDeathinfoService;
/**
@@ -284,11 +290,9 @@
}
@Override
- public Map<String, Object> getWorkFlow(Long id) {
+ public WorkFlowVO getWorkFlow(Long id) {
log.info("getWorkFlow鐨勫叆鍙侷D涓猴細{}", id);
- //鐢ㄤ簬杩斿洖
- Map<String, Object> map = new ConcurrentHashMap<>();
-
+ WorkFlowVO map1=new WorkFlowVO();
ServiceDonatebaseinfo serviceDonatebaseinfo = getById(id);
if (ObjectUtils.isEmpty(serviceDonatebaseinfo)) {
@@ -316,12 +320,11 @@
donatebaseinfo.put("process", "");
//灏佽serviceDonateorgan娼滃湪鎹愮尞杩斿洖鏁版嵁
log.info("妫�鏌ュ皝瑁呮綔鍦ㄦ崘鐚繑鍥炴暟鎹甦onatebaseinfo鐨勫�间负锛歿}", donatebaseinfo);
- map.put("donatebaseinfo", donatebaseinfo);
-
+ map1.setDonatebaseinfo(donatebaseinfo);
//灏佽鍖诲璇勪及
log.info("妫�鏌erviceDonatebaseinfo.getWorkflow()鐨勫�间负锛歿}", serviceDonatebaseinfo.getWorkflow());
Map<String, String> medicalevaluation = new HashMap<>();
- if (serviceDonatebaseinfo.getWorkflow() >= 1) {
+ //if (serviceDonatebaseinfo.getWorkflow() >= 1) {
ServiceMedicalevaluation serviceMedicalevaluation = new ServiceMedicalevaluation();
serviceMedicalevaluation.setInfoid(id);
List<ServiceMedicalevaluation> serviceMedicalevaluations = serviceMedicalevaluationService.queryList(serviceMedicalevaluation);
@@ -346,14 +349,14 @@
}
medicalevaluation.put("process", "");
}
- }
+ //}
//灏佽鍖诲璇勪及杩斿洖鏁版嵁
log.info("妫�鏌ュ皝瑁呭尰瀛﹁瘎浼拌繑鍥炴暟鎹甿edicalevaluation鐨勫�间负锛歿}", medicalevaluation);
- map.put("medicalevaluation", medicalevaluation);
+ map1.setMedicalevaluation(medicalevaluation);
//灏佽鎹愮尞纭
Map<String, String> relativesconfirmation = new HashMap<>();
- if (serviceDonatebaseinfo.getWorkflow() >= 2) {
+ //if (serviceDonatebaseinfo.getWorkflow() >= 2) {
ServiceRelativesconfirmation serviceRelativesconfirmation = new ServiceRelativesconfirmation();
serviceRelativesconfirmation.setInfoid(id);
List<ServiceRelativesconfirmation> serviceRelativesconfirmations = serviceRelativesconfirmationService.queryList(serviceRelativesconfirmation);
@@ -378,15 +381,14 @@
}
relativesconfirmation.put("process", "");
}
- }
+ //}
//灏佽鎹愮尞纭杩斿洖鏁版嵁
log.info("妫�鏌ュ皝瑁呮崘鐚‘璁よ繑鍥炴暟鎹畆elativesconfirmation鐨勫�间负锛歿}", relativesconfirmation);
- map.put("relativesconfirmation", relativesconfirmation);
-
+ map1.setRelativesconfirmation(relativesconfirmation);
//灏佽浼︾悊瀹℃煡
Map<String, String> donateflowcharts = new HashMap<>();
- if (serviceDonatebaseinfo.getWorkflow() >= 3) {
+ //if (serviceDonatebaseinfo.getWorkflow() >= 3) {
ServiceEthicalreviewopinions serviceDonateflowchart = new ServiceEthicalreviewopinions();
serviceDonateflowchart.setInfoid(id);
List<ServiceEthicalreviewopinions> serviceEthicalreviewopinionsList = iServiceEthicalreviewopinionsService.queryList(serviceDonateflowchart);
@@ -412,14 +414,14 @@
}
donateflowcharts.put("process", "");
}
- }
+ //}
//灏佽浼︾悊瀹℃煡杩斿洖鏁版嵁
log.info("妫�鏌ュ皝瑁呬鸡鐞嗗鏌ヨ繑鍥炴暟鎹甦onateflowcharts鐨勫�间负锛歿}", donateflowcharts);
- map.put("donateflowcharts", donateflowcharts);
+ map1.setDonateflowcharts(donateflowcharts);
//灏佽鍣ㄥ畼鍒嗛厤
Map<String, String> donateorgansService = new HashMap<>();
- if (serviceDonatebaseinfo.getWorkflow() >= 4) {
+ // if (serviceDonatebaseinfo.getWorkflow() >= 4) {
ServiceDonateorgan serviceDonateorgan = new ServiceDonateorgan();
serviceDonateorgan.setInfoid(id);
List<ServiceDonateorgan> serviceDonateorgans = serviceDonateorganService.queryList(serviceDonateorgan);
@@ -445,14 +447,14 @@
}
donateorgansService.put("process", "");
}
- }
+ //}
log.info("妫�鏌ュ皝瑁呭櫒瀹樺垎閰嶈繑鍥炴暟鎹甦onateorgansService鐨勫�间负锛歿}", donateorgansService);
//灏佽鍣ㄥ畼鍒嗛厤杩斿洖鏁版嵁
- map.put("donateorgansService", donateorgansService);
+ map1.setDonateorgansService(donateorgansService);
//灏佽鑾峰彇瑙佽瘉
Map<String, String> donationwitness = new HashMap<>();
- if (serviceDonatebaseinfo.getWorkflow() >= 5) {
+ //if (serviceDonatebaseinfo.getWorkflow() >= 5) {
ServiceDonationwitness serviceDonationwitness = serviceDonationwitnessService.getByInfoId(id);
log.info("妫�鏌erviceDonationwitness鐨勫�间负锛歿}", serviceDonationwitness);
if (!ObjectUtils.isEmpty(serviceDonationwitness)) {
@@ -476,14 +478,14 @@
donationwitness.put("process", "");
}
- }
+ //}
log.info("妫�鏌ュ皝瑁呰幏鍙栬璇佽繑鍥炴暟鎹甦onationwitness鐨勫�间负锛歿}", donationwitness);
//灏佽鑾峰彇瑙佽瘉杩斿洖鏁版嵁
- map.put("donationwitness", donationwitness);
+ map1.setDonationwitness(donationwitness);
//灏佽瀹屾垚鐧昏
Map<String, String> donatecompletioninfo = new HashMap<>();
- if (serviceDonatebaseinfo.getWorkflow() >= 6) {
+ // if (serviceDonatebaseinfo.getWorkflow() >= 6) {
ServiceDonatecompletioninfo serviceDonatecompletioninfo = new ServiceDonatecompletioninfo();
serviceDonatecompletioninfo.setInfoid(id);
List<ServiceDonatecompletioninfo> serviceDonatecompletioninfos = serviceDonatecompletioninfoService.queryList(serviceDonatecompletioninfo);
@@ -509,13 +511,69 @@
donatecompletioninfo.put("process", "");
}
- }
+ //}
log.info("妫�鏌ュ皝瑁呭畬鎴愮櫥璁拌繑鍥炴暟鎹甦onatecompletioninfo鐨勫�间负锛歿}", donatecompletioninfo);
//灏佽瀹屾垚鐧昏杩斿洖鏁版嵁
- map.put("donatecompletioninfo", donatecompletioninfo);
+ map1.setDonatecompletioninfo(donatecompletioninfo);
+
+ //渚涗綋缁存姢璁板綍
+ Map<String, String> donatemaintenance = new HashMap<>();
+ ServiceDonatemaintenanceEntity serviceDonatemaintenanceEntity=new ServiceDonatemaintenanceEntity();
+ serviceDonatemaintenanceEntity.setInfoid(id);
+ List<ServiceDonatemaintenanceEntity> donatemaintenanceEntityList= serviceDonatemaintenanceService.queryList(serviceDonatemaintenanceEntity).getRecords();
+ 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);
+ if (StringUtils.isNotBlank(donatemaintenanceEntityList.get(0).getCreateBy())) {
+ SysUser sysUser = sysUserMapper.selectUserByUserName(donatemaintenanceEntityList.get(0).getCreateBy());
+ if (!ObjectUtils.isEmpty(sysUser)) {
+ donatemaintenance.put("createperson", sysUser.getNickName());
+ }
+ }
+ donatemaintenance.put("updateperson", null);
+ if (StringUtils.isNotBlank(donatemaintenanceEntityList.get(0).getUpdateBy())) {
+ SysUser sysUser = sysUserMapper.selectUserByUserName(donatemaintenanceEntityList.get(0).getUpdateBy());
+ if (!ObjectUtils.isEmpty(sysUser)) {
+ donatemaintenance.put("updateperson", sysUser.getNickName());
+ }
+ }
+
+ donatemaintenance.put("process", "");
+ }
+ map1.setDonatemaintenance(donatemaintenance);
+
+ //鎮ｈ�呮浜′俊鎭�
+ Map<String, String> deathinfo = new HashMap<>();
+ ServiceDeathinfo serviceDeathinfo =new ServiceDeathinfo();
+ serviceDeathinfo.setInfoid(id);
+ List<ServiceDeathinfo> serviceDeathinfoList= serviceDeathinfoService.queryList(serviceDeathinfo).getRecords();
+ 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);
+ if (StringUtils.isNotBlank(serviceDeathinfoList.get(0).getCreateBy())) {
+ SysUser sysUser = sysUserMapper.selectUserByUserName(serviceDeathinfoList.get(0).getCreateBy());
+ if (!ObjectUtils.isEmpty(sysUser)) {
+ deathinfo.put("createperson", sysUser.getNickName());
+ }
+ }
+ deathinfo.put("updateperson", null);
+ if (StringUtils.isNotBlank(serviceDeathinfoList.get(0).getUpdateBy())) {
+ SysUser sysUser = sysUserMapper.selectUserByUserName(serviceDeathinfoList.get(0).getUpdateBy());
+ if (!ObjectUtils.isEmpty(sysUser)) {
+ deathinfo.put("updateperson", sysUser.getNickName());
+ }
+ }
+
+ deathinfo.put("process", "");
+ }
+ map1.setDeathinfo(deathinfo);
//灏嗘暟鎹皝闂紝骞惰繑鍥�
- return map;
+ return map1;
}
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceDeathinfoMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceDeathinfoMapper.xml
index 65162c8..4e80a62 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceDeathinfoMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceDeathinfoMapper.xml
@@ -49,7 +49,8 @@
update_by,
update_time,
judgment_description,
- ext_content
+ ext_content,
+ state
from service_deathinfo
</sql>
@@ -109,7 +110,8 @@
sdi.IsRestoreRemains as isrestoreremains,
sdi.RememberAnnex as rememberannex,
sdi.ResponsibleUserID as responsibleuserid,
- sdi.ResponsibleUserName as responsibleusername
+ sdi.ResponsibleUserName as responsibleusername,
+ sdi.state
FROM
service_donatebaseinfo sd
LEFT JOIN service_deathinfo sdi ON sd.ID = sdi.InfoID
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceDonatemaintenanceMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceDonatemaintenanceMapper.xml
index 53056ce..6a74211 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceDonatemaintenanceMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceDonatemaintenanceMapper.xml
@@ -63,7 +63,8 @@
sdm.item_name as itemName,
sdm.item_time as itemTime,
sdt.DeathTime as deathTime,
- sdm.item_desc as itemDesc
+ sdm.item_desc as itemDesc,
+ sdm.state
FROM
service_donatebaseinfo sd
LEFT JOIN service_donatemaintenance sdm ON sd.ID = sdm.InfoID
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceRelativesconfirmationMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceRelativesconfirmationMapper.xml
index d52137d..3bddf6f 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceRelativesconfirmationMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceRelativesconfirmationMapper.xml
@@ -307,7 +307,8 @@
sr.assessannex as assessannex,
sr.education as education,
sr.relativeconfirmationsignname,
- sr.relativeidcardno
+ sr.relativeidcardno,
+ sr.state
FROM service_donatebaseinfo sd
LEFT JOIN service_relativesconfirmation sr ON sd.ID = sr.InfoID and sd.del_flag = 0
AND sr.del_flag = 0
--
Gitblit v1.9.3