From f18d5a75c35774ba77802cd1f0c76706aeda8df7 Mon Sep 17 00:00:00 2001
From: wl <173@qq.com>
Date: 星期三, 23 十一月 2022 14:21:59 +0800
Subject: [PATCH] bug处理
---
ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/BaseCaseServiceImpl.java | 33 +++++++++++++++++++++++----------
1 files changed, 23 insertions(+), 10 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 2990dcf..52b1d17 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,28 +8,26 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ycl.bo.AdminUserDetails;
-import com.ycl.common.constant.BaseCaseStatus;
-import com.ycl.common.constant.StepName;
-import com.ycl.common.util.DateUtil;
+import com.ycl.controller.video.common.constant.BaseCaseStatus;
+import com.ycl.controller.video.common.constant.StepName;
+import com.ycl.controller.video.common.util.DateUtil;
+import com.ycl.dto.caseHandler.QueryForViolationParam;
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.dict.DataDictionary;
+import com.ycl.entity.resources.ImageResources;
import com.ycl.entity.video.VideoAlarmReport;
import com.ycl.exception.ApiException;
import com.ycl.mapper.caseHandler.*;
-import com.ycl.mapper.common.ImageResourcesMapper;
import com.ycl.mapper.dict.DataDictionaryMapper;
+import com.ycl.mapper.resources.ImageResourcesMapper;
import com.ycl.remote.dto.*;
import com.ycl.remote.service.CityPlatformService;
import com.ycl.service.caseHandler.IBaseCaseService;
import com.ycl.service.caseHandler.IViolationsService;
import com.ycl.service.video.IVideoAlarmReportService;
-import com.ycl.vo.casePool.CasePoolViolationVO;
-import com.ycl.vo.casePool.CurrentSitVo;
-import com.ycl.vo.casePool.FilesPictureVo;
-import com.ycl.vo.casePool.HandlePassVo;
+import com.ycl.vo.casePool.*;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
@@ -287,7 +285,7 @@
//3.鏌ヨ妗堝嵎鍥剧墖淇℃伅
FilesPictureVo filesPictureVo = new FilesPictureVo();
QueryWrapper<ImageResources> wrapperIr = new QueryWrapper<>();
- wrapperIr.lambda().eq(ImageResources::getBelongToId,baseCase.getId());
+ wrapperIr.lambda().eq(ImageResources::getBelongToId, baseCase.getId());
List<ImageResources> irs = imageResourcesMapper.selectList(wrapperIr);
filesPictureVo.setImageResources(irs);
bcd.setFilesPictureVo(filesPictureVo);
@@ -353,6 +351,7 @@
baseCase.setState(BaseCaseStatus.CLOSING_REGISTER);
baseCase.setId(caseId);
baseCase.setFinalOpinion(opinion);
+ baseCase.setCloseTime(LocalDateTime.now());
baseCaseMapper.updateById(baseCase);
QueryWrapper<WorkflowConfigStep> stepQurey = new QueryWrapper<>();
@@ -369,8 +368,22 @@
disposeRecord.setHandlerId(user.getUserId());
//缁撴宸茬粨鏉�
disposeRecord.setState(1);
+ disposeRecord.setResult(result);
disposeRecord.setEndTime(LocalDateTime.now());
disposeRecord.setHandlerId(user.getUserId());
disposeRecordMapper.update(disposeRecord, updateWrapper);
}
+
+ @Override
+ public List<BaseCase> selectPage(Page<BaseCase> page, String number, Integer communityId, Integer categories, String startTime, String endTime, String site) {
+ return baseCaseMapper.selectBaseCasePage(page, number, communityId, categories, startTime, endTime, site);
+ }
+
+ @Override
+ public Page<QueryForViolationVO> selectViolation(QueryForViolationParam queryForViolationParam) {
+ return baseCaseMapper.selectViolationPage(
+ new Page<QueryForViolationVO>()
+ .setSize(queryForViolationParam.getPageSize())
+ .setCurrent(queryForViolationParam.getCurrent()), queryForViolationParam);
+ }
}
\ No newline at end of file
--
Gitblit v1.8.0