From d46beba25ccb64a1047a98d642b6ce45e82f0bee Mon Sep 17 00:00:00 2001
From: wl <173@qq.com>
Date: 星期一, 17 十月 2022 18:07:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master
---
ycl-platform/src/main/java/com/ycl/controller/caseHandler/DispatchHandleController.java | 27 +++++++++++++--------------
1 files changed, 13 insertions(+), 14 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 96244c8..a19f04b 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
@@ -2,9 +2,11 @@
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.*;
@@ -51,6 +53,7 @@
@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());
@@ -59,17 +62,11 @@
@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();
-
- //淇敼妗堜欢鐘舵�佷负澶勭疆
- BaseCase baseCase = new BaseCase();
- baseCase.setId(caseId);
- baseCase.setState(BaseCaseStatus.DISPOSE);
- baseCaseService.updateById(baseCase);
-
//褰撲簨浜�
PartyInfo partyInfo = new PartyInfo();
BeanUtils.copyProperties(uploadDisposingResultParam, partyInfo);
@@ -81,7 +78,7 @@
BeanUtils.copyProperties(uploadDisposingResultParam, investigation);
investigation.setBaseCaseId(caseId);
investigation.setCreateTime(LocalDateTime.now());
- investigation.setCreateUser(user.getUserId().longValue());
+ investigation.setCreateUser(user.getUserId());
investigation.setPartyId(partyInfo.getId());
iInvestigationService.save(investigation);
//鍒拌揪
@@ -89,7 +86,7 @@
BeanUtils.copyProperties(uploadDisposingResultParam, arrivalSituation);
arrivalSituation.setBaseCaseId(caseId);
arrivalSituation.setCreateTime(LocalDateTime.now());
- arrivalSituation.setCreateUser(user.getUserId().longValue());
+ arrivalSituation.setCreateUser(user.getUserId());
iArrivalSituationService.save(arrivalSituation);
//鏂囦功
Integer illegalBuildingType = 2;
@@ -99,17 +96,19 @@
writ.setBaseCaseId(caseId);
writ.setIllegalBuildingId(caseId);
writ.setCreateTime(LocalDateTime.now());
- writ.setCreateUser(user.getUserId().longValue());
+ writ.setCreateUser(user.getUserId());
iWritService.save(writ);
}
- baseCaseService.update(new LambdaUpdateWrapper<BaseCase>().eq(BaseCase::getId, caseId).set(BaseCase::getState, BaseCaseStatus.CHECK));
+ 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("鏍告煡");
- iDisposeRecordService.save(disposeRecord);
+ disposeRecord.setCreateUser(user.getUserId());
+ disposeRecord.setStepName(stepName);
+ disposeRecord.setStartTime(LocalDateTime.now());
+ iDisposeRecordService.addRecord(disposeRecord);
return CommonResult.success("add success");
}
}
--
Gitblit v1.8.0