From 4e2975cee275d8315483b30c5d85b8c33a092e63 Mon Sep 17 00:00:00 2001
From: mg <maokecheng@163.com>
Date: 星期五, 21 十月 2022 15:30:53 +0800
Subject: [PATCH] 取消消息类型校验

---
 ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/BaseCaseServiceImpl.java |   18 ++++++++++++++----
 1 files changed, 14 insertions(+), 4 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 b23a37c..8ef6f1e 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
@@ -1,5 +1,6 @@
 package com.ycl.service.caseHandler.impl;
 
+import com.alibaba.druid.util.StringUtils;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -16,6 +17,7 @@
 import com.ycl.dto.casePool.ViolationParam;
 import com.ycl.entity.caseHandler.*;
 import com.ycl.entity.common.ImageResources;
+import com.ycl.entity.dict.DataDictionary;
 import com.ycl.entity.video.VideoAlarmReport;
 import com.ycl.exception.ApiException;
 import com.ycl.mapper.caseHandler.*;
@@ -235,7 +237,9 @@
         disposeRecord.setCreateUser(userDetails.getUserId());
         disposeRecord.setStartTime(LocalDateTime.now());
         disposeRecord.setStepName(stepName);
-        disposeRecord.setLimitTime(LocalDateTime.parse(limitTime, DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+        if (!StringUtils.isEmpty(limitTime)) {
+            disposeRecord.setLimitTime(LocalDateTime.parse(limitTime, DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+        }
         disposeRecordMapper.insert(disposeRecord);
     }
 
@@ -267,6 +271,12 @@
             baseCase.setViolations(violations);
         } else {
             IllegalBuilding illegalBuilding = illegalBuildingMapper.selectById(baseCase.getId());
+            LambdaQueryWrapper<DataDictionary> dict = new LambdaQueryWrapper<>();
+            dict.eq(DataDictionary::getId, illegalBuilding.getCategoryId());
+            DataDictionary dictionary =  dataDictionaryMapper.selectOne(dict);
+            if (dictionary != null) {
+                illegalBuilding.setCategoryText(dictionary.getName());
+            }
             baseCase.setIllegalBuilding(illegalBuilding);
         }
         //鑾峰彇璋冨害淇℃伅
@@ -295,10 +305,10 @@
                 continue;
             }
             for (DisposeRecord record : records) {
-                if (record != null && record.getEndTime() != null) {
+                if (record != null && record.getEndTime() != null && record.getStartTime() != null) {
                     record.setLinkTime(
                             DateUtil.getDistanceDateTime(
-                                    DateUtil.fromLocalDateTime(baseCase.getAlarmTime()),
+                                    DateUtil.fromLocalDateTime(record.getStartTime()),
                                     DateUtil.fromLocalDateTime(record.getEndTime())));
                 }
             }
@@ -310,7 +320,7 @@
         //3.鏌ヨ妗堝嵎鍥剧墖淇℃伅
         FilesPictureVo filesPictureVo = new FilesPictureVo();
         QueryWrapper<ImageResources> wrapperIr = new QueryWrapper<>();
-        wrapperIr.lambda().eq(ImageResources::getType, "01").or().eq(ImageResources::getType, "02");
+        wrapperIr.lambda().eq(ImageResources::getBelongToId,baseCase.getId());
         List<ImageResources> irs = imageResourcesMapper.selectList(wrapperIr);
         filesPictureVo.setImageResources(irs);
         bcd.setFilesPictureVo(filesPictureVo);

--
Gitblit v1.8.0