From bd8147d7890bf60d88e4007c1af726ba5f364cf5 Mon Sep 17 00:00:00 2001
From: baizonghao <1719256278@qq.com>
Date: 星期二, 14 三月 2023 11:24:31 +0800
Subject: [PATCH] 拼接地址
---
ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/DisposeRecordServiceImpl.java | 148 ++++++++++++++++++++++--------------------------
1 files changed, 68 insertions(+), 80 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 deea175..b9c3042 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
@@ -4,10 +4,11 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ycl.bo.AdminUserDetails;
-import com.ycl.controller.video.common.constant.BaseCaseStatus;
-import com.ycl.controller.video.common.constant.StepName;
+import com.ycl.common.constant.BaseCaseStatus;
+import com.ycl.common.constant.StepName;
import com.ycl.dto.dispatch.UploadDisposingResultParam;
import com.ycl.entity.caseHandler.*;
import com.ycl.entity.resources.ImageResources;
@@ -65,31 +66,25 @@
IImageResourcesService iImageResourcesService;
@Override
- public List<MyBacklogVO> listMyTask(String num, Long userId) {
- return disposeRecordMapper.selectMyBackList(userId, num);
+ public Page<MyBacklogVO> listMyTask(Page<MyBacklogVO> page, String num, Long userId) {
+ return disposeRecordMapper.selectMyBackList(page,userId, num);
}
@Override
@Transactional(rollbackFor = Exception.class)
public Boolean saveOrUpdateUpload(UploadDisposingResultParam uploadDisposingResultParam) {
AdminUserDetails user = (AdminUserDetails) SecurityContextHolder.getContext().getAuthentication().getPrincipal();
- ArrivalSituation arrivalSituationed = iArrivalSituationService.getOne(new LambdaQueryWrapper<ArrivalSituation>().eq(ArrivalSituation::getBaseCaseId, uploadDisposingResultParam.getCaseId()));
- if (arrivalSituationed!=null || arrivalSituationed.getId()!=null){
+ List<ArrivalSituation> list = iArrivalSituationService.list(new LambdaQueryWrapper<ArrivalSituation>().eq(ArrivalSituation::getBaseCaseId, uploadDisposingResultParam.getCaseId()));
+ if (!list.isEmpty()) {
//褰撲簨浜�
PartyInfo partyInfo = new PartyInfo();
- if (StringUtils.isNotEmpty(uploadDisposingResultParam.getName())) {
- BeanUtils.copyProperties(uploadDisposingResultParam, partyInfo);
- partyInfo.setCreateUser(user.getUserId().intValue());
- partyInfo.setCreateTime(LocalDateTime.now());
- partyInfo.setId(uploadDisposingResultParam.getPartyInfoId());
- iPartyInfoService.updateById(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.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")));
investigation.setId(uploadDisposingResultParam.getInvestigationId());
@@ -98,8 +93,6 @@
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")));
arrivalSituation.setId(uploadDisposingResultParam.getArrivalSituationId());
iArrivalSituationService.updateById(arrivalSituation);
@@ -108,22 +101,17 @@
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()));
imageResources.setId(uploadDisposingResultParam.getImageResourcesId());
iImageResourcesService.updateById(imageResources);
- if (uploadDisposingResultParam.getWritCode() == null || uploadDisposingResultParam.getWritType() == null) {
+ 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")));
- writ.setBaseCaseId(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()
@@ -134,64 +122,65 @@
, uploadDisposingResultParam.getWritPic()));
iImageResourcesService.updateById(imageResources);
}
- }
-
- //褰撲簨浜�
- PartyInfo partyInfo = new PartyInfo();
- if (StringUtils.isNotEmpty(uploadDisposingResultParam.getName())) {
+ 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(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);
- }
+ //璋冩煡鍙栬瘉
+ 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));
+ 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());
@@ -200,7 +189,6 @@
disposeRecord.setCreateUser(user.getUserId());
disposeRecord.setStepName(stepName);
disposeRecord.setStartTime(LocalDateTime.now());
-
//缁撴潫涓婁紶澶勭疆娴佺▼
QueryWrapper<WorkflowConfigStep> qureyDispatch = new QueryWrapper<>();
qureyDispatch.eq("name", StepName.DISPOSE.getName());
--
Gitblit v1.8.0