From 7ea3a05f4298ddd675de1a18fff147be8b0b4950 Mon Sep 17 00:00:00 2001
From: mg <maokecheng@163.com>
Date: 星期一, 10 十月 2022 17:09:49 +0800
Subject: [PATCH] 新增全部栏目获取接口

---
 ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/BaseCaseServiceImpl.java |   48 ++++++++++++++++++++++++++++++++----------------
 1 files changed, 32 insertions(+), 16 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 e47ebfe..fc5aa94 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.constant.BaseCaseStatus;
 import com.ycl.common.util.DateUtil;
 import com.ycl.dto.casePool.IllegalBuildingParam;
 import com.ycl.dto.casePool.ViolationParam;
@@ -33,7 +34,9 @@
 import java.time.Duration;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 /**
@@ -193,7 +196,7 @@
     }
 
     @Override
-    public Boolean saveViolationCase(ViolationParam violationParam, Integer id) {
+    public Boolean saveViolationCase(ViolationParam violationParam, Long id) {
         Violations violations = new Violations();
         BeanUtils.copyProperties(violationParam, violations);
         violations.setId(id);
@@ -202,9 +205,9 @@
     }
 
     @Override
-    public Boolean saveIllegalBuildingCase(IllegalBuildingParam illegalBuildingParam, Integer id) {
+    public Boolean saveIllegalBuildingCase(IllegalBuildingParam illegalBuildingParam, Long id) {
         IllegalBuilding illegalBuilding = new IllegalBuilding();
-        BeanUtils.copyProperties(illegalBuilding, illegalBuildingParam);
+        BeanUtils.copyProperties(illegalBuildingParam, illegalBuilding);
         illegalBuilding.setBaseCaseId(id);
         Integer value = 1;
         return illegalBuildingMapper.insert(illegalBuilding) == value ? true : false;
@@ -217,6 +220,9 @@
         QueryWrapper<BaseCase> wrapper = new QueryWrapper<>();
         wrapper.lambda().eq(BaseCase::getCode, code);
         BaseCase baseCase = baseCaseMapper.selectOne(wrapper);
+        if (baseCase == null) {
+            return null;
+        }
         bcd.setBaseCase(baseCase);
         //2.鏌ヨ鍔炵悊缁忚繃淇℃伅
         //2.1鏌ヨ澶勭疆娴佺▼閰嶇疆
@@ -234,15 +240,25 @@
             }
         }
         //2.2鏌ヨ澶勭疆娴佺▼鐜妭閰嶇疆
-        List<WorkflowConfigStep> listWcs = workflowConfigStepMapper.selectRecordByWorkflowConfigStepId(ddlcId);
+        Map mapWcs = new HashMap();
+        mapWcs.put("workflowConfigId", ddlcId);
+        mapWcs.put("baseCaseId", baseCase.getId());
+        List<WorkflowConfigStep> listWcs = workflowConfigStepMapper.selectRecordByWorkflowConfigStepId(mapWcs);
         //澶勭悊鐢ㄧ幆鑺傛椂闂�
         for (WorkflowConfigStep step : listWcs) {
-            DisposeRecord record = step.getDisposeRecord();
-            record.setLinkTime(
-                    DateUtil.getDistanceDateTime(
-                            DateUtil.fromLocalDateTime(baseCase.getAlarmTime()),
-                            DateUtil.fromLocalDateTime(record.getCreateTime())));
-            step.setDisposeRecord(record);
+            List<DisposeRecord> records = step.getDisposeRecords();
+            if (records == null) {
+                continue;
+            }
+            for (DisposeRecord record : records) {
+                if (record != null&&record.getCreateTime()!=null) {
+                    record.setLinkTime(
+                            DateUtil.getDistanceDateTime(
+                                    DateUtil.fromLocalDateTime(baseCase.getAlarmTime()),
+                                    DateUtil.fromLocalDateTime(record.getCreateTime())));
+                }
+            }
+            step.setDisposeRecords(records);
         }
         //2.3璁剧疆璋冨害娴佺▼
         handlePassVo.setWorkflowConfigSteps(listWcs);
@@ -257,7 +273,8 @@
         //4.鏌ヨ闂澶勭悊淇℃伅
         ProblemProVo problemProVo = new ProblemProVo();
         //4.2鏌ヨ澶勭疆娴佺▼鐜妭閰嶇疆
-        List<WorkflowConfigStep> listWcsPp = workflowConfigStepMapper.selectRecordByWorkflowConfigStepId(wtcllcId);
+        mapWcs.put("workflowConfigId", wtcllcId);
+        List<WorkflowConfigStep> listWcsPp = workflowConfigStepMapper.selectRecordByWorkflowConfigStepId(mapWcs);
         //4.3璁剧疆璋冨害娴佺▼
         problemProVo.setWorkflowConfigSteps(listWcsPp);
         bcd.setProblemProVo(problemProVo);
@@ -303,13 +320,12 @@
     }
 
     @Override
-    public void endCase(Integer caseId, String result) {
+    public void endCase(Long caseId, String result) {
         AdminUserDetails user = (AdminUserDetails) SecurityContextHolder.getContext().getAuthentication().getPrincipal();
-        Integer endCaseState = 6;
-        Integer state = 2;
+        Integer state = 1;
         String endCaseName = "缁撴";
         BaseCase baseCase = new BaseCase();
-        baseCase.setState(endCaseState);
+        baseCase.setState(BaseCaseStatus.CLOSING_REGISTER);
         baseCase.setId(caseId);
         baseCaseMapper.updateById(baseCase);
         DisposeRecord disposeRecord = new DisposeRecord();
@@ -317,7 +333,7 @@
         disposeRecord.setWorkflowConfigStepId(workflowConfigStepMapper
                 .selectOne(new LambdaQueryWrapper<WorkflowConfigStep>().eq(WorkflowConfigStep::getName, endCaseName))
                 .getWorkflowConfigId());
-        disposeRecord.setCreateUser(user.getUserId().intValue());
+        disposeRecord.setCreateUser(user.getUserId().longValue());
         disposeRecord.setResult(result);
         disposeRecord.setState(state);
         disposeRecord.setCreateTime(LocalDateTime.now());

--
Gitblit v1.8.0