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 | 14 ++++++++------
1 files changed, 8 insertions(+), 6 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 7282283..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
@@ -6,6 +6,7 @@
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.*;
@@ -77,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);
//鍒拌揪
@@ -85,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;
@@ -95,18 +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.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.setCreateUser(user.getUserId());
+ disposeRecord.setStepName(stepName);
disposeRecord.setStartTime(LocalDateTime.now());
- iDisposeRecordService.save(disposeRecord);
+ iDisposeRecordService.addRecord(disposeRecord);
return CommonResult.success("add success");
}
}
--
Gitblit v1.8.0