From f6f995e5875570cafb976b2cadf90c6abdab1139 Mon Sep 17 00:00:00 2001
From: wl <173@qq.com>
Date: 星期二, 29 十一月 2022 16:46:45 +0800
Subject: [PATCH] fix: 违规检索导出和查询车牌号
---
ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/DisposeRecordServiceImpl.java | 221 +++++++++++++++++++++++++++++++++---------------------
1 files changed, 134 insertions(+), 87 deletions(-)
diff --git a/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/DisposeRecordServiceImpl.java b/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/DisposeRecordServiceImpl.java
index f032d78..898ba0e 100644
--- a/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/DisposeRecordServiceImpl.java
+++ b/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/DisposeRecordServiceImpl.java
@@ -1,5 +1,6 @@
package com.ycl.service.caseHandler.impl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
@@ -70,100 +71,146 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public Boolean saveUpload(Long caseId, Integer type, UploadDisposingResultParam uploadDisposingResultParam) {
+ public Boolean saveOrUpdateUpload(UploadDisposingResultParam uploadDisposingResultParam) {
AdminUserDetails user = (AdminUserDetails) SecurityContextHolder.getContext().getAuthentication().getPrincipal();
- //褰撲簨浜�
- PartyInfo partyInfo = new PartyInfo();
- if (StringUtils.isNotEmpty(uploadDisposingResultParam.getName())) {
+ List<ArrivalSituation> list = iArrivalSituationService.list(new LambdaQueryWrapper<ArrivalSituation>().eq(ArrivalSituation::getBaseCaseId, uploadDisposingResultParam.getCaseId()));
+ if (!list.isEmpty()) {
+ //褰撲簨浜�
+ PartyInfo partyInfo = new PartyInfo();
+ BeanUtils.copyProperties(uploadDisposingResultParam, partyInfo);
+ partyInfo.setId(uploadDisposingResultParam.getPartyInfoId());
+ iPartyInfoService.updateById(partyInfo);
+ //璋冩煡鍙栬瘉
+ Investigation investigation = new Investigation();
+ BeanUtils.copyProperties(uploadDisposingResultParam, investigation);
+ investigation.setBaseCaseId(uploadDisposingResultParam.getCaseId());
+ investigation.setPartyId(partyInfo.getId());
+ investigation.setInvestigationTime(LocalDateTime.parse(uploadDisposingResultParam.getInvestigationTime(), DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+ investigation.setId(uploadDisposingResultParam.getInvestigationId());
+ iInvestigationService.updateById(investigation);
+ //鍒拌揪
+ ArrivalSituation arrivalSituation = new ArrivalSituation();
+ BeanUtils.copyProperties(uploadDisposingResultParam, arrivalSituation);
+ arrivalSituation.setBaseCaseId(uploadDisposingResultParam.getCaseId());
+ arrivalSituation.setArrivalTime(LocalDateTime.parse(uploadDisposingResultParam.getArrivalTime(), DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+ arrivalSituation.setId(uploadDisposingResultParam.getArrivalSituationId());
+ iArrivalSituationService.updateById(arrivalSituation);
+ //鏂囦功
+ String handType = "02";
+ ImageResources imageResources = new ImageResources();
+ imageResources.setType(handType);
+ imageResources.setBelongToId(uploadDisposingResultParam.getCaseId());
+ imageResources.setUrl(StringUtils.joinWith(",", uploadDisposingResultParam.getPic(), uploadDisposingResultParam.getSituationPic()));
+ imageResources.setId(uploadDisposingResultParam.getImageResourcesId());
+ iImageResourcesService.updateById(imageResources);
+ if (uploadDisposingResultParam.getWritCode() != null && uploadDisposingResultParam.getWritType() != null) {
+ Writ writ = new Writ();
+ BeanUtils.copyProperties(uploadDisposingResultParam, writ);
+ writ.setBaseCaseId(uploadDisposingResultParam.getCaseId());
+ writ.setIllegalBuildingId(uploadDisposingResultParam.getCaseId());
+ writ.setLimitTime(LocalDateTime.parse(uploadDisposingResultParam.getLimitTime(), DateTimeFormatter.ofPattern("YYYY-MM-dd HH:mm:ss")));
+ writ.setRectifyTime(LocalDateTime.parse(uploadDisposingResultParam.getRectifyTime(), DateTimeFormatter.ofPattern("YYYY-MM-dd HH:mm:ss")));
+ writ.setSendTime(LocalDateTime.parse(uploadDisposingResultParam.getSendTime(), DateTimeFormatter.ofPattern("YYYY-MM-dd HH:mm:ss")));
+ iWritService.updateById(writ);
+ imageResources.setUrl(StringUtils
+ .joinWith(",", uploadDisposingResultParam.getPic()
+ , uploadDisposingResultParam.getSituationPic()
+ , uploadDisposingResultParam.getOriginalPic()
+ , uploadDisposingResultParam.getOtherPic()
+ , uploadDisposingResultParam.getRectifiedPic()
+ , uploadDisposingResultParam.getWritPic()));
+ iImageResourcesService.updateById(imageResources);
+ }
+ return baseCaseService.update(new LambdaUpdateWrapper<BaseCase>().eq(BaseCase::getId, uploadDisposingResultParam.getCaseId()).set(BaseCase::getState, BaseCaseStatus.DISPOSE));
+ } else {
+ //褰撲簨浜�
+ PartyInfo partyInfo = new PartyInfo();
BeanUtils.copyProperties(uploadDisposingResultParam, partyInfo);
partyInfo.setCreateUser(user.getUserId().intValue());
partyInfo.setCreateTime(LocalDateTime.now());
iPartyInfoService.save(partyInfo);
- }
- //璋冩煡鍙栬瘉
- Investigation investigation = new Investigation();
- BeanUtils.copyProperties(uploadDisposingResultParam, investigation);
- investigation.setBaseCaseId(caseId);
- investigation.setCreateTime(LocalDateTime.now());
- investigation.setCreateUser(user.getUserId());
- investigation.setPartyId(partyInfo.getId());
- investigation.setInvestigationTime(LocalDateTime.parse(uploadDisposingResultParam.getInvestigationTime(), DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
- iInvestigationService.save(investigation);
- //鍒拌揪
- ArrivalSituation arrivalSituation = new ArrivalSituation();
- BeanUtils.copyProperties(uploadDisposingResultParam, arrivalSituation);
- arrivalSituation.setBaseCaseId(caseId);
- arrivalSituation.setCreateTime(LocalDateTime.now());
- arrivalSituation.setCreateUser(user.getUserId());
- arrivalSituation.setArrivalTime(LocalDateTime.parse(uploadDisposingResultParam.getArrivalTime(), DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
- iArrivalSituationService.save(arrivalSituation);
- //鏂囦功
- Integer illegalBuildingType = 2;
- Integer violation = 1;
- String handType = "02";
- ImageResources imageResources = new ImageResources();
- imageResources.setType(handType);
- imageResources.setBelongToId(caseId);
- imageResources.setCreateTime(LocalDateTime.now());
- imageResources.setCreateUser(user.getUserId());
- if (type == violation) {
+ //璋冩煡鍙栬瘉
+ Investigation investigation = new Investigation();
+ BeanUtils.copyProperties(uploadDisposingResultParam, investigation);
+ investigation.setBaseCaseId(uploadDisposingResultParam.getCaseId());
+ investigation.setCreateTime(LocalDateTime.now());
+ investigation.setCreateUser(user.getUserId());
+ investigation.setPartyId(partyInfo.getId());
+ investigation.setInvestigationTime(LocalDateTime.parse(uploadDisposingResultParam.getInvestigationTime(), DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+ iInvestigationService.save(investigation);
+ //鍒拌揪
+ ArrivalSituation arrivalSituation = new ArrivalSituation();
+ BeanUtils.copyProperties(uploadDisposingResultParam, arrivalSituation);
+ arrivalSituation.setBaseCaseId(uploadDisposingResultParam.getCaseId());
+ arrivalSituation.setCreateTime(LocalDateTime.now());
+ arrivalSituation.setCreateUser(user.getUserId());
+ arrivalSituation.setArrivalTime(LocalDateTime.parse(uploadDisposingResultParam.getArrivalTime(), DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+ iArrivalSituationService.save(arrivalSituation);
+ //鏂囦功
+ String handType = "02";
+ ImageResources imageResources = new ImageResources();
+ imageResources.setType(handType);
+ imageResources.setBelongToId(uploadDisposingResultParam.getCaseId());
+ imageResources.setCreateTime(LocalDateTime.now());
+ imageResources.setCreateUser(user.getUserId());
imageResources.setUrl(StringUtils.joinWith(",", uploadDisposingResultParam.getPic(), uploadDisposingResultParam.getSituationPic()));
iImageResourcesService.save(imageResources);
+ if (uploadDisposingResultParam.getWritCode() != null && uploadDisposingResultParam.getWritType() != null) {
+ Writ writ = new Writ();
+ BeanUtils.copyProperties(uploadDisposingResultParam, writ);
+ writ.setBaseCaseId(uploadDisposingResultParam.getCaseId());
+ writ.setIllegalBuildingId(uploadDisposingResultParam.getCaseId());
+ writ.setCreateTime(LocalDateTime.now());
+ writ.setCreateUser(user.getUserId());
+ writ.setLimitTime(LocalDateTime.parse(uploadDisposingResultParam.getLimitTime(), DateTimeFormatter.ofPattern("YYYY-MM-dd HH:mm:ss")));
+ writ.setRectifyTime(LocalDateTime.parse(uploadDisposingResultParam.getRectifyTime(), DateTimeFormatter.ofPattern("YYYY-MM-dd HH:mm:ss")));
+ writ.setSendTime(LocalDateTime.parse(uploadDisposingResultParam.getSendTime(), DateTimeFormatter.ofPattern("YYYY-MM-dd HH:mm:ss")));
+ iWritService.save(writ);
+ imageResources.setUrl(StringUtils
+ .joinWith(",", uploadDisposingResultParam.getPic()
+ , uploadDisposingResultParam.getSituationPic()
+ , uploadDisposingResultParam.getOriginalPic()
+ , uploadDisposingResultParam.getOtherPic()
+ , uploadDisposingResultParam.getRectifiedPic()
+ , uploadDisposingResultParam.getWritPic()));
+ iImageResourcesService.updateById(imageResources);
+ }
+
+ baseCaseService.update(new LambdaUpdateWrapper<BaseCase>().eq(BaseCase::getId, uploadDisposingResultParam.getCaseId()).set(BaseCase::getState, BaseCaseStatus.DISPOSE));
+ String stepName = StepName.CHECK.getName();
+ DisposeRecord disposeRecord = new DisposeRecord();
+ disposeRecord.setBaseCaseId(uploadDisposingResultParam.getCaseId());
+ disposeRecord.setState(0);
+ disposeRecord.setCreateTime(LocalDateTime.now());
+ disposeRecord.setCreateUser(user.getUserId());
+ disposeRecord.setStepName(stepName);
+ disposeRecord.setStartTime(LocalDateTime.now());
+
+ //缁撴潫涓婁紶澶勭疆娴佺▼
+ QueryWrapper<WorkflowConfigStep> qureyDispatch = new QueryWrapper<>();
+ qureyDispatch.eq("name", StepName.DISPOSE.getName());
+ WorkflowConfigStep dispatchStep = workflowConfigStepMapper.selectOne(qureyDispatch);
+
+ UpdateWrapper<DisposeRecord> updateWrapper = new UpdateWrapper<>();
+ updateWrapper.eq("base_case_id", disposeRecord.getBaseCaseId()).eq("workflow_config_step_id", dispatchStep.getId());
+
+ DisposeRecord updateRecord = new DisposeRecord();
+ updateRecord.setState(1);
+ updateRecord.setEndTime(LocalDateTime.now());
+ updateRecord.setHandlerId(disposeRecord.getCreateUser());
+ updateRecord.setResult(uploadDisposingResultParam.getDescription());
+ baseMapper.update(updateRecord, updateWrapper);
+
+ QueryWrapper<WorkflowConfigStep> stepQurey = new QueryWrapper<>();
+ stepQurey.eq("name", disposeRecord.getStepName());
+ WorkflowConfigStep workflowConfigStep = workflowConfigStepMapper.selectOne(stepQurey);
+ if (workflowConfigStep == null) {
+ throw new ApiException("鏈煡璇㈠埌璇ユ祦绋嬬幆鑺�");
+ }
+ //璁剧疆娴佺▼鐜妭鏁版嵁
+ disposeRecord.setWorkflowConfigStepId(workflowConfigStep.getId());
+ disposeRecord.setHandlerRoleId(workflowConfigStep.getRoleId());
+ return baseMapper.insert(disposeRecord) == 1 ? true : false;
}
- if (type == illegalBuildingType) {
- Writ writ = new Writ();
- BeanUtils.copyProperties(uploadDisposingResultParam, writ);
- writ.setBaseCaseId(caseId);
- writ.setIllegalBuildingId(caseId);
- writ.setCreateTime(LocalDateTime.now());
- writ.setCreateUser(user.getUserId());
- writ.setLimitTime(LocalDateTime.parse(uploadDisposingResultParam.getLimitTime(), DateTimeFormatter.ofPattern("YYYY-MM-dd HH:mm:ss")));
- writ.setRectifyTime(LocalDateTime.parse(uploadDisposingResultParam.getRectifyTime(), DateTimeFormatter.ofPattern("YYYY-MM-dd HH:mm:ss")));
- writ.setSendTime(LocalDateTime.parse(uploadDisposingResultParam.getSendTime(), DateTimeFormatter.ofPattern("YYYY-MM-dd HH:mm:ss")));
- iWritService.save(writ);
- imageResources.setUrl(StringUtils
- .joinWith(",", uploadDisposingResultParam.getPic()
- , uploadDisposingResultParam.getSituationPic()
- , uploadDisposingResultParam.getOriginalPic()
- , uploadDisposingResultParam.getOtherPic()
- , uploadDisposingResultParam.getRectifiedPic()
- , uploadDisposingResultParam.getWritPic()));
- iImageResourcesService.save(imageResources);
- }
- baseCaseService.update(new LambdaUpdateWrapper<BaseCase>().eq(BaseCase::getId, caseId).set(BaseCase::getState, BaseCaseStatus.DISPOSE));
- String stepName = StepName.CHECK.getName();
- DisposeRecord disposeRecord = new DisposeRecord();
- disposeRecord.setBaseCaseId(caseId);
- disposeRecord.setState(0);
- disposeRecord.setCreateTime(LocalDateTime.now());
- disposeRecord.setCreateUser(user.getUserId());
- disposeRecord.setStepName(stepName);
- disposeRecord.setStartTime(LocalDateTime.now());
-
- //缁撴潫涓婁紶澶勭疆娴佺▼
- QueryWrapper<WorkflowConfigStep> qureyDispatch = new QueryWrapper<>();
- qureyDispatch.eq("name", StepName.DISPOSE.getName());
- WorkflowConfigStep dispatchStep = workflowConfigStepMapper.selectOne(qureyDispatch);
-
- UpdateWrapper<DisposeRecord> updateWrapper = new UpdateWrapper<>();
- updateWrapper.eq("base_case_id", disposeRecord.getBaseCaseId()).eq("workflow_config_step_id", dispatchStep.getId());
-
- DisposeRecord updateRecord = new DisposeRecord();
- updateRecord.setState(1);
- updateRecord.setEndTime(LocalDateTime.now());
- updateRecord.setHandlerId(disposeRecord.getCreateUser());
- updateRecord.setResult(uploadDisposingResultParam.getDescription());
- baseMapper.update(updateRecord, updateWrapper);
-
- QueryWrapper<WorkflowConfigStep> stepQurey = new QueryWrapper<>();
- stepQurey.eq("name", disposeRecord.getStepName());
- WorkflowConfigStep workflowConfigStep = workflowConfigStepMapper.selectOne(stepQurey);
- if (workflowConfigStep == null) {
- throw new ApiException("鏈煡璇㈠埌璇ユ祦绋嬬幆鑺�");
- }
- //璁剧疆娴佺▼鐜妭鏁版嵁
- disposeRecord.setWorkflowConfigStepId(workflowConfigStep.getId());
- disposeRecord.setHandlerRoleId(workflowConfigStep.getRoleId());
- return baseMapper.insert(disposeRecord) == 1 ? true : false;
}
}
--
Gitblit v1.8.0