From 3f9ebf19e687c33287b0eaec64d4564a212f57db Mon Sep 17 00:00:00 2001
From: mg <maokecheng@163.com>
Date: 星期三, 12 十月 2022 16:59:57 +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 | 39 +++++++++++++++++++++++++++++++--------
1 files changed, 31 insertions(+), 8 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 28df6d8..d3ffe96 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,8 +1,10 @@
package com.ycl.controller.caseHandler;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.ycl.api.CommonResult;
import com.ycl.bo.AdminUserDetails;
+import com.ycl.common.constant.BaseCaseStatus;
import com.ycl.dto.caseHandler.DispatchInfoParam;
import com.ycl.dto.dispatch.UploadDisposingResultParam;
import com.ycl.entity.caseHandler.*;
@@ -27,7 +29,7 @@
*/
@RestController
@RequestMapping("/dispatch_handle")
-@Api(tags = "璋冨害澶勭悊")
+@Api(tags = "璋冨害")
public class DispatchHandleController {
@@ -41,6 +43,10 @@
IPartyInfoService iPartyInfoService;
@Autowired
IWritService iWritService;
+ @Autowired
+ IBaseCaseService baseCaseService;
+ @Autowired
+ IDisposeRecordService iDisposeRecordService;
@ApiOperation(value = "璋冨害")
@RequestMapping(value = "/dispatch", method = RequestMethod.POST)
@@ -50,9 +56,18 @@
}
@ApiOperation(value = "涓婁紶杩濊/杩濆缓澶勭疆缁撴灉")
- @GetMapping("/addition_")
- public CommonResult searchDisposeList(@RequestParam Integer caseId, @RequestParam Integer type, @RequestBody UploadDisposingResultParam uploadDisposingResultParam) {
+ @PostMapping("/addition_dispose_result")
+ 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);
@@ -64,7 +79,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);
//鍒拌揪
@@ -72,19 +87,27 @@
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);
}
+ baseCaseService.update(new LambdaUpdateWrapper<BaseCase>().eq(BaseCase::getId, caseId).set(BaseCase::getState, BaseCaseStatus.CHECK));
+ DisposeRecord disposeRecord = new DisposeRecord();
+ disposeRecord.setBaseCaseId(caseId);
+ disposeRecord.setState(0);
+ disposeRecord.setCreateTime(LocalDateTime.now());
+ disposeRecord.setCreateUser(user.getUserId().longValue());
+ disposeRecord.setStepName("鏍告煡");
+ iDisposeRecordService.save(disposeRecord);
return CommonResult.success("add success");
}
}
--
Gitblit v1.8.0