From 704e7207d74b6477c5f472c5aba92d484ab17f98 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期三, 29 十一月 2023 17:07:11 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server
---
ycl-platform/src/main/java/com/ycl/controller/caseHandler/DispatchHandleController.java | 63 ++++---------------------------
1 files changed, 8 insertions(+), 55 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 a19f04b..74db768 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
@@ -1,25 +1,20 @@
package com.ycl.controller.caseHandler;
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.ycl.annotation.LogSave;
import com.ycl.api.CommonResult;
import com.ycl.bo.AdminUserDetails;
-import com.ycl.common.constant.BaseCaseStatus;
-import com.ycl.common.constant.StepName;
import com.ycl.dto.caseHandler.DispatchInfoParam;
import com.ycl.dto.dispatch.UploadDisposingResultParam;
-import com.ycl.entity.caseHandler.*;
+import com.ycl.entity.caseHandler.DispatchInfo;
import com.ycl.service.caseHandler.*;
+import com.ycl.service.resources.IImageResourcesService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
-
-import java.time.LocalDateTime;
/**
* <p>
@@ -49,11 +44,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 +59,9 @@
@ApiOperation(value = "涓婁紶杩濊/杩濆缓澶勭疆缁撴灉")
@PostMapping("/addition_dispose_result")
- @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());
- 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());
- 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());
- 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());
- disposeRecord.setStepName(stepName);
- disposeRecord.setStartTime(LocalDateTime.now());
- iDisposeRecordService.addRecord(disposeRecord);
+ @LogSave(operationType = "浜嬮」澶勭疆绠＄悊", contain = "妗堜欢涓婁紶澶勭疆缁撴灉")
+ public CommonResult searchDisposeList(@RequestBody UploadDisposingResultParam uploadDisposingResultParam) {
+ iDisposeRecordService.saveOrUpdateUpload(uploadDisposingResultParam);
return CommonResult.success("add success");
}
}
--
Gitblit v1.8.0