From 09d16543f899f54b8d96671a355a53a5740b1937 Mon Sep 17 00:00:00 2001
From: mg <maokecheng@163.com>
Date: 星期四, 13 十月 2022 11:38:08 +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 | 45 ++++++++++++++++++++++++++++-----------------
1 files changed, 28 insertions(+), 17 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 78a6fe0..7282283 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,6 +1,8 @@
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;
@@ -28,7 +30,7 @@
*/
@RestController
@RequestMapping("/dispatch_handle")
-@Api(tags = "璋冨害澶勭悊")
+@Api(tags = "璋冨害")
public class DispatchHandleController {
@@ -43,26 +45,27 @@
@Autowired
IWritService iWritService;
@Autowired
- private IBaseCaseService baseCaseService;
+ IBaseCaseService baseCaseService;
+ @Autowired
+ IDisposeRecordService iDisposeRecordService;
@ApiOperation(value = "璋冨害")
@RequestMapping(value = "/dispatch", method = RequestMethod.POST)
@ResponseBody
+ @LogSave(operationType = "浜嬮」澶勭疆绠＄悊",contain = "妗堜欢璋冨害")
public CommonResult<DispatchInfo> dispatch(@Validated @RequestBody DispatchInfoParam dispatchInfoParam) {
+ AdminUserDetails user = (AdminUserDetails) SecurityContextHolder.getContext().getAuthentication().getPrincipal();
+ dispatchInfoParam.setCreateUser(user.getUserId());
return CommonResult.success(iDispatchHandleService.dispatch(dispatchInfoParam));
}
@ApiOperation(value = "涓婁紶杩濊/杩濆缓澶勭疆缁撴灉")
- @GetMapping("/addition_dispose_result")
- public CommonResult searchDisposeList(@RequestParam Integer caseId, @RequestParam Integer type, @RequestBody UploadDisposingResultParam uploadDisposingResultParam) {
+ @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();
-
- //淇敼妗堜欢鐘舵�佷负澶勭疆
- BaseCase baseCase = new BaseCase();
- baseCase.setId(caseId);
- baseCase.setState(BaseCaseStatus.DISPOSE);
- baseCaseService.updateById(baseCase);
-
//褰撲簨浜�
PartyInfo partyInfo = new PartyInfo();
BeanUtils.copyProperties(uploadDisposingResultParam, partyInfo);
@@ -74,7 +77,7 @@
BeanUtils.copyProperties(uploadDisposingResultParam, investigation);
investigation.setBaseCaseId(caseId);
investigation.setCreateTime(LocalDateTime.now());
- investigation.setCreateUser(user.getUserId().intValue());
+ investigation.setCreateUser(user.getUserId().longValue());
investigation.setPartyId(partyInfo.getId());
iInvestigationService.save(investigation);
//鍒拌揪
@@ -82,20 +85,28 @@
BeanUtils.copyProperties(uploadDisposingResultParam, arrivalSituation);
arrivalSituation.setBaseCaseId(caseId);
arrivalSituation.setCreateTime(LocalDateTime.now());
- arrivalSituation.setCreateUser(user.getUserId().intValue());
+ arrivalSituation.setCreateUser(user.getUserId().longValue());
iArrivalSituationService.save(arrivalSituation);
//鏂囦功
- Integer illegalBuildingType = 02;
- if (type == illegalBuildingType) {
+ 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().intValue());
+ writ.setCreateUser(user.getUserId().longValue());
iWritService.save(writ);
}
- /// TODO: 2022/9/30 娣诲姞鎴愬姛鍚庝慨鏀规浠朵笓棰� 娣诲姞娴佺▼
+ baseCaseService.update(new LambdaUpdateWrapper<BaseCase>().eq(BaseCase::getId, caseId).set(BaseCase::getState, BaseCaseStatus.DISPOSE));
+ DisposeRecord disposeRecord = new DisposeRecord();
+ disposeRecord.setBaseCaseId(caseId);
+ disposeRecord.setState(0);
+ disposeRecord.setCreateTime(LocalDateTime.now());
+ disposeRecord.setCreateUser(user.getUserId().longValue());
+ disposeRecord.setStepName("鏍告煡");
+ disposeRecord.setStartTime(LocalDateTime.now());
+ iDisposeRecordService.save(disposeRecord);
return CommonResult.success("add success");
}
}
--
Gitblit v1.8.0