From 0c342d5495689e71b29a1b712a166dc7774a6b0d Mon Sep 17 00:00:00 2001
From: mg <maokecheng@163.com>
Date: 星期四, 29 九月 2022 18:34:30 +0800
Subject: [PATCH] 添加流程记录。

---
 ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/BaseCaseServiceImpl.java |   26 +++++++++++++++++---------
 1 files changed, 17 insertions(+), 9 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 b1913e7..e5220d4 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
@@ -4,20 +4,22 @@
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ycl.bo.casePool.*;
+import com.ycl.bo.casePool.CasePoolIllegalBuildingDO;
+import com.ycl.bo.casePool.CasePoolViolationDO;
 import com.ycl.dto.casePool.IllegalBuildingParam;
 import com.ycl.dto.casePool.ViolationParam;
 import com.ycl.entity.caseHandler.*;
+import com.ycl.entity.common.ImageResources;
 import com.ycl.entity.video.VideoAlarmReport;
 import com.ycl.mapper.caseHandler.*;
+import com.ycl.mapper.common.ImageResourcesMapper;
 import com.ycl.mapper.dict.DataDictionaryMapper;
 import com.ycl.remote.dto.EventAddParamDto;
 import com.ycl.remote.dto.EventProcessParamDto;
 import com.ycl.service.caseHandler.IBaseCaseService;
 import com.ycl.service.caseHandler.IViolationsService;
 import com.ycl.service.video.IVideoAlarmReportService;
-import com.ycl.vo.casePool.CasePoolIllegalBuildingVO;
-import com.ycl.vo.casePool.CasePoolViolationVO;
+import com.ycl.vo.casePool.*;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -84,6 +86,10 @@
     WorkflowConfigStepMapper workflowConfigStepMapper;
     @Resource
     WorkflowConfigMapper workflowConfigMapper;
+    @Resource
+    ImageResourcesMapper imageResourcesMapper;
+
+
 
 
     @Override
@@ -226,19 +232,21 @@
             }
         }
         //2.2鏌ヨ澶勭疆娴佺▼鐜妭閰嶇疆
-        QueryWrapper<WorkflowConfigStep> wrapperWcs = new QueryWrapper<>();
-        wrapperWcs.lambda().eq(WorkflowConfigStep::getWorkflowConfigId, ddlcId);
-        List<WorkflowConfigStep> listWcs = workflowConfigStepMapper.selectList(wrapperWcs);
+        List<WorkflowConfigStep> listWcs = workflowConfigStepMapper.selectRecordByWorkflowConfigStepId(ddlcId);
         //2.3璁剧疆璋冨害娴佺▼
         handlePassVo.setWorkflowConfigSteps(listWcs);
         bcd.setHandlePassVo(handlePassVo);
         //3.鏌ヨ妗堝嵎鍥剧墖淇℃伅
+        FilesPictureVo filesPictureVo = new FilesPictureVo();
+        QueryWrapper<ImageResources> wrapperIr = new QueryWrapper<>();
+        wrapperIr.lambda().eq(ImageResources::getType, "01").or().eq(ImageResources::getType, "02");
+        List<ImageResources> irs = imageResourcesMapper.selectList(wrapperIr);
+        filesPictureVo.setImageResources(irs);
+        bcd.setFilesPictureVo(filesPictureVo);
         //4.鏌ヨ闂澶勭悊淇℃伅
         ProblemProVo problemProVo = new ProblemProVo();
         //4.2鏌ヨ澶勭疆娴佺▼鐜妭閰嶇疆
-        QueryWrapper<WorkflowConfigStep> wrapperWcsPp = new QueryWrapper<>();
-        wrapperWcsPp.lambda().eq(WorkflowConfigStep::getWorkflowConfigId, wtcllcId);
-        List<WorkflowConfigStep> listWcsPp = workflowConfigStepMapper.selectList(wrapperWcsPp);
+        List<WorkflowConfigStep> listWcsPp = workflowConfigStepMapper.selectRecordByWorkflowConfigStepId(wtcllcId);
         //4.3璁剧疆璋冨害娴佺▼
         problemProVo.setWorkflowConfigSteps(listWcsPp);
         bcd.setProblemProVo(problemProVo);

--
Gitblit v1.8.0