From 2d964c50c7ac6557e968328e5931006686c4cfbb Mon Sep 17 00:00:00 2001
From: mg <maokecheng@163.com>
Date: 星期五, 28 十月 2022 12:52:15 +0800
Subject: [PATCH] 解决冲突
---
ycl-platform/src/main/java/com/ycl/controller/caseHandler/DispatchHandleController.java | 51 ++++++---------------------------------------------
1 files changed, 6 insertions(+), 45 deletions(-)
diff --git a/ycl-platform/src/main/java/com/ycl/controller/caseHandler/DispatchHandleController.java b/ycl-platform/src/main/java/com/ycl/controller/caseHandler/DispatchHandleController.java
index 3c06d2a..71dfe4c 100644
--- a/ycl-platform/src/main/java/com/ycl/controller/caseHandler/DispatchHandleController.java
+++ b/ycl-platform/src/main/java/com/ycl/controller/caseHandler/DispatchHandleController.java
@@ -13,6 +13,7 @@
import com.ycl.service.caseHandler.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.core.context.SecurityContextHolder;
@@ -49,11 +50,13 @@
IBaseCaseService baseCaseService;
@Autowired
IDisposeRecordService iDisposeRecordService;
+ @Autowired
+ IImageResourcesService iImageResourcesService;
@ApiOperation(value = "璋冨害")
@RequestMapping(value = "/dispatch", method = RequestMethod.POST)
@ResponseBody
- @LogSave(operationType = "浜嬮」澶勭疆绠＄悊",contain = "妗堜欢璋冨害")
+ @LogSave(operationType = "浜嬮」澶勭疆绠＄悊", contain = "妗堜欢璋冨害")
public CommonResult<DispatchInfo> dispatch(@Validated @RequestBody DispatchInfoParam dispatchInfoParam) {
AdminUserDetails user = (AdminUserDetails) SecurityContextHolder.getContext().getAuthentication().getPrincipal();
dispatchInfoParam.setCreateUser(user.getUserId());
@@ -62,53 +65,11 @@
@ApiOperation(value = "涓婁紶杩濊/杩濆缓澶勭疆缁撴灉")
@PostMapping("/addition_dispose_result")
- @LogSave(operationType = "浜嬮」澶勭疆绠＄悊",contain = "妗堜欢涓婁紶澶勭疆缁撴灉")
+ @LogSave(operationType = "浜嬮」澶勭疆绠＄悊", contain = "妗堜欢涓婁紶澶勭疆缁撴灉")
public CommonResult searchDisposeList(@RequestParam Long caseId,
@RequestParam Integer type,
@RequestBody UploadDisposingResultParam uploadDisposingResultParam) {
- AdminUserDetails user = (AdminUserDetails) SecurityContextHolder.getContext().getAuthentication().getPrincipal();
- //褰撲簨浜�
- 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().longValue());
- investigation.setPartyId(partyInfo.getId());
- iInvestigationService.save(investigation);
- //鍒拌揪
- ArrivalSituation arrivalSituation = new ArrivalSituation();
- BeanUtils.copyProperties(uploadDisposingResultParam, arrivalSituation);
- arrivalSituation.setBaseCaseId(caseId);
- arrivalSituation.setCreateTime(LocalDateTime.now());
- arrivalSituation.setCreateUser(user.getUserId().longValue());
- iArrivalSituationService.save(arrivalSituation);
- //鏂囦功
- Integer illegalBuildingType = 2;
- if (type.equals(illegalBuildingType)) {
- Writ writ = new Writ();
- BeanUtils.copyProperties(uploadDisposingResultParam, writ);
- writ.setBaseCaseId(caseId);
- writ.setIllegalBuildingId(caseId);
- writ.setCreateTime(LocalDateTime.now());
- writ.setCreateUser(user.getUserId().longValue());
- iWritService.save(writ);
- }
- 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().longValue());
- disposeRecord.setStepName(stepName);
- disposeRecord.setStartTime(LocalDateTime.now());
- iDisposeRecordService.addRecord(disposeRecord);
+ iDisposeRecordService.saveUpload(caseId,type,uploadDisposingResultParam);
return CommonResult.success("add success");
}
}
--
Gitblit v1.8.0