From 87a395a6024278594a0a80d25a24ba4ca5993513 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期六, 18 三月 2023 17:42:10 +0800
Subject: [PATCH] 统计修改
---
ycl-platform/src/main/java/com/ycl/controller/caseHandler/BaseCaseController.java | 52 ++++++++++++++++++++++++----------------------------
1 files changed, 24 insertions(+), 28 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 569df4d..58a96b7 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
@@ -113,7 +113,6 @@
}
return CommonResult.failed("request parameter is null");
}*/
-
@ApiOperation(value = "鏌ヨ杩濊杩濆缓")
@GetMapping("/query")
@ApiImplicitParams({
@@ -131,8 +130,8 @@
})
public CommonResult searchViolation(@RequestParam Integer size,
@RequestParam Integer current,
- @RequestParam Integer state,
- @RequestParam(required = false) Integer type,
+ @RequestParam(required = false) Integer state,
+ @RequestParam Integer type,
@RequestParam(required = false) Integer resource,
@RequestParam(required = false) String code,
@RequestParam(required = false) String categoryBig,
@@ -140,21 +139,18 @@
@RequestParam(required = false) Integer street,
@RequestParam(required = false) String site,
@RequestParam(required = false) String startTime,
- @RequestParam(required = false) String endTime ){
- if (state != null) {
- Page<Object> queryList;
- Integer violation = 1;
- Integer illegalBuilding = 2;
- if (type == violation) {
- queryList = baseCaseService.listViolationsPage(new Page<>().setCurrent(current).setSize(size), state, resource, code, categoryBig, categorySmall, street, site, startTime, endTime);
- } else if (type == illegalBuilding) {
- queryList = baseCaseService.listIllegalBuilding(new Page<>().setCurrent(current).setSize(size), state, resource);
- } else {
- return CommonResult.failed("bad request url");
- }
- return CommonResult.success(queryList);
+ @RequestParam(required = false) String endTime,
+ @RequestParam(required = false) Integer violationsTypeId) {
+
+ Page<Object> queryList;
+ if (type == 1) {
+ queryList = baseCaseService.listViolationsPage(new Page<>().setCurrent(current).setSize(size), state, resource, code, categoryBig, categorySmall, street, site, startTime, endTime, violationsTypeId);
+ } else if (type == 2) {
+ queryList = baseCaseService.listIllegalBuilding(new Page<>().setCurrent(current).setSize(size), state, resource);
+ } else {
+ return CommonResult.failed("bad request url");
}
- return CommonResult.failed("request parameter is null");
+ return CommonResult.success(queryList);
}
/**
@@ -316,18 +312,18 @@
@ApiOperation(value = "璋冨害绠＄悊-鎵归噺鍒犻櫎")
@DeleteMapping("/batch_case_delete")
- public CommonResult batchCaseDelete(@RequestParam List<Long> ids){
+ public CommonResult batchCaseDelete(@RequestParam List<Long> ids) {
ids.forEach(
- item->{
- BaseCase baseCase = baseCaseService.getOne(new LambdaQueryWrapper<BaseCase>().eq(BaseCase::getId, item));
- if (baseCase.getCategory()==1){
- violationsService.removeById(item);
- baseCaseService.removeById(item);
- }else {
- illegalBuildingService.removeById(item);
- baseCaseService.removeById(item);
+ item -> {
+ BaseCase baseCase = baseCaseService.getOne(new LambdaQueryWrapper<BaseCase>().eq(BaseCase::getId, item));
+ if (baseCase.getCategory() == 1) {
+ violationsService.removeById(item);
+ baseCaseService.removeById(item);
+ } else {
+ illegalBuildingService.removeById(item);
+ baseCaseService.removeById(item);
+ }
}
- }
);
return CommonResult.success("success");
}
@@ -344,7 +340,7 @@
Integer state = iDisposeRecordService
.list(new LambdaQueryWrapper<DisposeRecord>()
.eq(DisposeRecord::getBaseCaseId, caseId).
- orderByDesc(DisposeRecord::getCreateTime)).get(firstNum).getState();
+ orderByDesc(DisposeRecord::getCreateTime)).get(firstNum).getState();
return CommonResult.success(baseCaseService
.update(new LambdaUpdateWrapper<BaseCase>()
.eq(BaseCase::getId, caseId)
--
Gitblit v1.8.0