From 30da6663b02b07a917d2789ef0a3c5cec2a03b80 Mon Sep 17 00:00:00 2001
From: mg <maokecheng@163.com>
Date: 星期一, 10 十月 2022 10:46:52 +0800
Subject: [PATCH] 用户修改和消息表新增字段
---
ycl-platform/src/main/java/com/ycl/controller/caseHandler/BaseCaseController.java | 13 ++++++-------
1 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/ycl-platform/src/main/java/com/ycl/controller/caseHandler/BaseCaseController.java b/ycl-platform/src/main/java/com/ycl/controller/caseHandler/BaseCaseController.java
index d54c7d6..8f29023 100644
--- a/ycl-platform/src/main/java/com/ycl/controller/caseHandler/BaseCaseController.java
+++ b/ycl-platform/src/main/java/com/ycl/controller/caseHandler/BaseCaseController.java
@@ -6,6 +6,7 @@
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ycl.api.CommonResult;
+import com.ycl.common.constant.BaseCaseStatus;
import com.ycl.controller.BaseController;
import com.ycl.dto.casePool.IllegalBuildingParam;
import com.ycl.dto.casePool.ViolationParam;
@@ -164,13 +165,12 @@
public CommonResult addViolationCase(@RequestBody @Validated ViolationParam violationParam) {
Integer violation = 1;
Integer resource = 2;
- Integer state = 7;
BaseCase baseCase = new BaseCase();
BeanUtils.copyProperties(violationParam, baseCase);
baseCase.setEventSource(resource);
baseCase.setCategory(violation);
baseCase.setCode(UUID.randomUUID().toString());
- baseCase.setState(state);
+ baseCase.setState(BaseCaseStatus.PENDING);
baseCaseService.save(baseCase);
return CommonResult.success(baseCaseService.saveViolationCase(violationParam, baseCase.getId()));
}
@@ -185,13 +185,12 @@
public CommonResult addIllegalBuildingCase(@RequestBody @Validated IllegalBuildingParam illegalBuildingParam) {
Integer illegalBuilding = 2;
Integer resource = 2;
- Integer state = 7;
BaseCase baseCase = new BaseCase();
BeanUtils.copyProperties(illegalBuildingParam, baseCase);
baseCase.setCategory(illegalBuilding);
baseCase.setEventSource(resource);
baseCase.setCode(UUID.randomUUID().toString());
- baseCase.setState(state);
+ baseCase.setState(BaseCaseStatus.PENDING);
baseCaseService.save(baseCase);
return CommonResult.success(baseCaseService.saveIllegalBuildingCase(illegalBuildingParam, baseCase.getId()));
}
@@ -222,7 +221,7 @@
@ApiOperation(value = "妗堜欢鐘舵�佷慨鏀�")
@PutMapping("/case_status_update")
@ApiImplicitParams({
- @ApiImplicitParam(value = "澶勭悊鐘舵��(0璇姤 1涓婃姤 2绔嬫 3娲鹃仯 4澶勭疆 5鏍告煡 6缁撴7澶勭悊涓�8鏆備笉澶勭悊)", name = "state")
+ @ApiImplicitParam(value = "澶勭悊鐘舵��(0-寰呭鐞�1-璇姤2-涓婃姤3-鍐嶅涔�/鍐嶈缁�4鏆備笉澶勭悊5绔嬫6璋冨害7澶勭疆8鏍告煡9缁撴)", name = "state")
})
public CommonResult updateCaseStatus(@RequestParam Integer caseId, @RequestParam Integer state) {
return CommonResult.success(baseCaseService
@@ -239,7 +238,7 @@
@ApiOperation(value = "鏆備笉澶勭疆閲嶆柊澶勭疆")
@PutMapping("/reset")
public CommonResult resetCase(@RequestParam Integer caseId) {
- Integer firstNum = 0;
+ Integer firstNum = 1;
Integer state = iDisposeRecordService
.list(new LambdaQueryWrapper<DisposeRecord>()
.eq(DisposeRecord::getBaseCaseId, caseId).
@@ -252,7 +251,7 @@
@ApiOperation(value = "缁撴")
@PutMapping("/end_case")
- public CommonResult endCase(@RequestParam Integer caseId, @RequestParam String result) {
+ public CommonResult endCase(@RequestParam Long caseId, @RequestParam String result) {
baseCaseService.endCase(caseId, result);
return CommonResult.success("end case success~!");
}
--
Gitblit v1.8.0