From 9e14c41a50bb859c9d3ffd0154cb03ac2a1728d6 Mon Sep 17 00:00:00 2001
From: mg <maokecheng@163.com>
Date: 星期一, 03 十月 2022 16:46:48 +0800
Subject: [PATCH] 优化案件详情接口

---
 ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/BaseCaseServiceImpl.java |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 deletions(-)

diff --git a/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/BaseCaseServiceImpl.java b/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/BaseCaseServiceImpl.java
index de22bbc..e47ebfe 100644
--- a/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/BaseCaseServiceImpl.java
+++ b/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/BaseCaseServiceImpl.java
@@ -8,6 +8,7 @@
 import com.ycl.bo.AdminUserDetails;
 import com.ycl.bo.casePool.CasePoolIllegalBuildingDO;
 import com.ycl.bo.casePool.CasePoolViolationDO;
+import com.ycl.common.util.DateUtil;
 import com.ycl.dto.casePool.IllegalBuildingParam;
 import com.ycl.dto.casePool.ViolationParam;
 import com.ycl.entity.caseHandler.*;
@@ -234,6 +235,15 @@
         }
         //2.2鏌ヨ澶勭疆娴佺▼鐜妭閰嶇疆
         List<WorkflowConfigStep> listWcs = workflowConfigStepMapper.selectRecordByWorkflowConfigStepId(ddlcId);
+        //澶勭悊鐢ㄧ幆鑺傛椂闂�
+        for (WorkflowConfigStep step : listWcs) {
+            DisposeRecord record = step.getDisposeRecord();
+            record.setLinkTime(
+                    DateUtil.getDistanceDateTime(
+                            DateUtil.fromLocalDateTime(baseCase.getAlarmTime()),
+                            DateUtil.fromLocalDateTime(record.getCreateTime())));
+            step.setDisposeRecord(record);
+        }
         //2.3璁剧疆璋冨害娴佺▼
         handlePassVo.setWorkflowConfigSteps(listWcs);
         bcd.setHandlePassVo(handlePassVo);
@@ -254,6 +264,7 @@
         //5.鏌ヨ鐜板満鎯呭喌淇℃伅
         CurrentSitVo currentSitVo = new CurrentSitVo();
         QueryWrapper<ArrivalSituation> wrapperAs = new QueryWrapper<>();
+        wrapperAs.lambda().eq(ArrivalSituation::getBaseCaseId, baseCase.getId());
         //璁剧疆鍒拌揪鐜板満鎯呭喌
         ArrivalSituation as = arrivalSituationMapper.selectOne(wrapperAs);
         currentSitVo.setArrivalSituation(as);

--
Gitblit v1.8.0