From 8d0e312443876371e2be7ae9a2cb70e4f73bb2cd Mon Sep 17 00:00:00 2001
From: mg <maokecheng@163.com>
Date: 星期日, 02 十月 2022 09:35:33 +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/BaseCaseController.java | 7 ++++---
1 files changed, 4 insertions(+), 3 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 5e4c11d..a891839 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
@@ -10,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.BaseCaseDetail;
import com.ycl.entity.caseHandler.DisposeRecord;
import com.ycl.service.caseHandler.IBaseCaseService;
import com.ycl.service.caseHandler.IDisposeRecordService;
@@ -37,7 +38,7 @@
* @since 2022-09-24
*/
@RestController
-@RequestMapping("/base_case")
+@RequestMapping("/base-case")
@Api(tags = "妗堜欢姹�")
public class BaseCaseController extends BaseController {
@@ -143,12 +144,12 @@
Integer violationType = 1;
Integer illegalBuildingType = 2;
if (!ids.isEmpty()) {
+ CommonResult.success(baseCaseService.removeBatchByIds(ids));
if (type == violationType) {
return CommonResult.success(violationsService.removeBatchByIds(ids));
} else if (type == illegalBuildingType) {
return CommonResult.success(illegalBuildingService.removeBatchByIds(ids));
}
- return CommonResult.success(baseCaseService.removeBatchByIds(ids));
}
return CommonResult.failed("request parameter is null");
}
@@ -200,7 +201,7 @@
@ApiImplicitParams({
@ApiImplicitParam(name = "code", value = "浜嬩欢缂栧彿")
})
- public CommonResult baseCaseDetail(@PathVariable(value = "code") String code) {
+ public CommonResult<BaseCaseDetail> baseCaseDetail(@PathVariable(value = "code") String code) {
return CommonResult.success(baseCaseService.baseCaseDetail(code));
}
--
Gitblit v1.8.0