From b9e7a0261443ca41b80108b9fef555093f20bb8b Mon Sep 17 00:00:00 2001 From: mg <maokecheng@163.com> Date: 星期五, 14 十月 2022 16:48:13 +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 | 9 +++++++-- 1 files changed, 7 insertions(+), 2 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 86a5f66..3c06d2a 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,6 +62,7 @@ @ApiOperation(value = "涓婁紶杩濊/杩濆缓澶勭疆缁撴灉") @PostMapping("/addition_dispose_result") + @LogSave(operationType = "浜嬮」澶勭疆绠$悊",contain = "妗堜欢涓婁紶澶勭疆缁撴灉") public CommonResult searchDisposeList(@RequestParam Long caseId, @RequestParam Integer type, @RequestBody UploadDisposingResultParam uploadDisposingResultParam) { @@ -96,14 +100,15 @@ 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("鏍告煡"); + disposeRecord.setStepName(stepName); disposeRecord.setStartTime(LocalDateTime.now()); - iDisposeRecordService.save(disposeRecord); + iDisposeRecordService.addRecord(disposeRecord); return CommonResult.success("add success"); } } -- Gitblit v1.8.0