From 68c92dc86cc15ca8d4982a73e7404bd479f2232c Mon Sep 17 00:00:00 2001 From: zhanghua <314079846@qq.com> Date: 星期二, 22 十一月 2022 17:20:28 +0800 Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server --- ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/BaseCaseServiceImpl.java | 21 ++++++++++++++------- 1 files changed, 14 insertions(+), 7 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 7d3c506..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,9 +8,10 @@ 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.*; @@ -26,10 +27,7 @@ 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; @@ -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<>(); @@ -379,4 +378,12 @@ 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