From 35f6bd0e69018621c2293b96ddcde55b2bc58d36 Mon Sep 17 00:00:00 2001 From: wl <173@qq.com> Date: 星期五, 30 九月 2022 16:31:23 +0800 Subject: [PATCH] 结案 暂不处理 我的待办 功能实现 --- ycl-platform/src/main/java/com/ycl/controller/caseHandler/BaseCaseController.java | 49 ++++++++++++++++++++++++++++++++++++++++++------- 1 files changed, 42 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 c607977..6b74abf 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 @@ -2,6 +2,7 @@ import com.alibaba.druid.util.StringUtils; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ycl.api.CommonResult; @@ -9,6 +10,7 @@ import com.ycl.dto.casePool.IllegalBuildingParam; import com.ycl.dto.casePool.ViolationParam; import com.ycl.entity.caseHandler.BaseCase; +import com.ycl.entity.caseHandler.DisposeRecord; import com.ycl.service.caseHandler.IBaseCaseService; import com.ycl.service.caseHandler.IDisposeRecordService; import com.ycl.service.caseHandler.IIllegalBuildingService; @@ -36,7 +38,7 @@ * @since 2022-09-24 */ @RestController -@RequestMapping("/base-case") +@RequestMapping("/base_case") @Api(tags = "妗堜欢姹�") public class BaseCaseController extends BaseController { @@ -204,7 +206,7 @@ return CommonResult.success(baseCaseService.baseCaseDetail(code)); } - @ApiOperation("浜哄伐璺緞妗堜欢鍥剧墖灞曠ず") + @ApiOperation(value = "浜哄伐璺緞妗堜欢鍥剧墖灞曠ず") @GetMapping("/hand_work_case_images") @ApiImplicitParams({ @ApiImplicitParam(name = "type", value = "01 杩濊,02 杩濆缓", dataType = "Integer") @@ -213,13 +215,46 @@ return CommonResult.success(baseCaseService.listCaseImages(id, type)); } - @ApiOperation("妗堜欢鏆備笉澶勭悊") - @PutMapping("/case_leave") - public CommonResult updateCaseStatus(@RequestParam Integer caseId) { - Integer leaveType = 8; + /** + * @return com.ycl.api.CommonResult + * @Description case status update + * @Param [caseId, status] + **/ + @ApiOperation(value = "妗堜欢鐘舵�佷慨鏀�") + @PutMapping("/case_status_update") + @ApiImplicitParams({ + @ApiImplicitParam(value = "澶勭悊鐘舵��(0璇姤 1涓婃姤 2绔嬫 3娲鹃仯 4澶勭疆 5鏍告煡 6缁撴7澶勭悊涓�8鏆備笉澶勭悊)",name = "state") + }) + public CommonResult updateCaseStatus(@RequestParam Integer caseId, @RequestParam Integer state) { return CommonResult.success(baseCaseService .update(new LambdaUpdateWrapper<BaseCase>() .eq(BaseCase::getId, caseId) - .set(BaseCase::getState, leaveType))); + .set(BaseCase::getState, state))); + } + + /** + * @return com.ycl.api.CommonResult + * @Description reset case + * @Param [caseId] + **/ + @ApiOperation(value = "鏆備笉澶勭疆閲嶆柊澶勭疆") + @PutMapping("/reset") + public CommonResult resetCase(@RequestParam Integer caseId) { + Integer firstNum = 0; + Integer state = iDisposeRecordService + .list(new LambdaQueryWrapper<DisposeRecord>() + .eq(DisposeRecord::getBaseCaseId, caseId). + orderByDesc(DisposeRecord::getCreateTime)).get(firstNum).getState(); + return CommonResult.success(baseCaseService + .update(new LambdaUpdateWrapper<BaseCase>() + .eq(BaseCase::getId, caseId) + .set(BaseCase::getState, state))); + } + + @ApiOperation(value = "缁撴") + @PutMapping("/end_case") + public CommonResult endCase(@RequestParam Integer caseId,@RequestParam String result){ + baseCaseService.endCase(caseId,result); + return CommonResult.success("end case success~!"); } } -- Gitblit v1.8.0