From c4c1c6cf89781eb06dc02b677a8954fdb2666c43 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期三, 16 七月 2025 22:39:06 +0800
Subject: [PATCH] 添加时间筛选
---
ycl-platform/src/main/java/com/ycl/controller/caseHandler/BaseCaseController.java | 37 +++++++++++++++++++++++++++++--------
1 files changed, 29 insertions(+), 8 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 9720a00..b9518d3 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
@@ -13,6 +13,7 @@
import com.ycl.controller.BaseController;
import com.ycl.common.constant.BaseCaseStatus;
import com.ycl.common.util.UtilNumber;
+import com.ycl.dto.caseHandler.CheckParam;
import com.ycl.dto.caseHandler.QueryForViolationParam;
import com.ycl.dto.casePool.IllegalBuildingParam;
import com.ycl.dto.casePool.VideoInspectParam;
@@ -163,13 +164,13 @@
@RequestParam(required = false) Integer videoId) {
Page<Object> queryList;
- // 澶勭悊鐘舵��(wait(0-寰呭鐞�) handle(5绔嬫6璋冨害7澶勭疆8鏍告煡) finish(1-璇姤2-涓婃姤3-鍐嶅涔�/鍐嶈缁�4鏆備笉澶勭悊 9缁撴)
+ // 澶勭悊鐘舵��(wait(0-寰呭鐞�) handle(5绔嬫6璋冨害7澶勭疆8鏍告煡) finish(1-璇姤2-涓婃姤3-鍐嶅涔�/鍐嶈缁�4鏆備笉澶勭悊 9缁撴)
List<Integer> stateList = new ArrayList<>();
- switch (state){
+ switch (state) {
case "wait":
stateList.add(0);
break;
- case "handle":
+ case "handle":
stateList.add(5);
stateList.add(6);
stateList.add(7);
@@ -181,6 +182,11 @@
stateList.add(3);
stateList.add(4);
stateList.add(9);
+ break;
+ case "-1":
+ break;
+ default:
+ stateList.add(Integer.valueOf(state));
break;
}
if (type == 1) {
@@ -350,7 +356,7 @@
ImageResources imageResources = new ImageResources();
imageResources.setType("01");
imageResources.setBelongToId(baseCase.getId());
- imageResources.setUrl(illegalBuildingParam.getImageUrls().toString());
+ imageResources.setUrl(String.join(",", illegalBuildingParam.getImageUrls()));
imageResources.setCreateTime(LocalDateTime.now());
imageResources.setCreateUser(user.getUserId());
iImageResourcesService.save(imageResources);
@@ -480,6 +486,19 @@
return CommonResult.success("end case success~!");
}
+ @ApiOperation(value = "鎵归噺缁撴")
+ @RequestMapping(value = "/end_case_batch", method = RequestMethod.POST)
+ @ResponseBody
+ @LogSave(operationType = "鎵归噺缁撴", contain = "鎵归噺缁撴")
+ public CommonResult endCaseBatch(@RequestBody CheckParam checkParam) {
+ checkParam.getIds().forEach(o -> {
+ String result = "缁撴";
+ String opinion = "鍚屾剰缁撴";
+ baseCaseService.endCase(o, result, opinion);
+ });
+ return CommonResult.success("end case success~!");
+ }
+
@ApiOperation(value = "鏌ヨ妗堝嵎")
@GetMapping("/query_case")
public CommonResult<Page<BaseCase>> queryCase(@RequestParam Integer pageSize,
@@ -542,15 +561,17 @@
@GetMapping("/work_order")
@ApiOperation("宸ュ崟缁熻")
public CommonResult getWorkOrder(@RequestParam Integer currentPage,
- @RequestParam Integer pageSize,
- @RequestParam(required = false) String keyword) {
- return CommonResult.success(baseCaseService.getWorkOrder(currentPage, pageSize, keyword));
+ @RequestParam Integer pageSize,
+ @RequestParam(required = false) String keyword,
+ @RequestParam(required = false) String startTime,
+ @RequestParam(required = false) String endTime) {
+ return CommonResult.success(baseCaseService.getWorkOrder(currentPage, pageSize, keyword, startTime, endTime));
}
@PostMapping("/work_order/export")
@ApiOperation("宸ュ崟缁熻-瀵煎嚭")
public void getWorkOrderExport(HttpServletResponse response, QueryForViolationParam param) {
String sheetName = "宸ュ崟鏁版嵁";
- EasyExcelUtils.export(response, sheetName, WorkOrderVO.class, baseCaseService.getWorkOrderList(param.getKeyword()));
+ EasyExcelUtils.export(response, sheetName, WorkOrderVO.class, baseCaseService.getWorkOrderList(param.getKeyword(), param.getStartTime(), param.getEndTime()));
}
}
\ No newline at end of file
--
Gitblit v1.8.0