From a4cd4c2d98392cd1036f36b96c262878743a7e63 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期四, 05 九月 2024 19:52:22 +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 | 25 ++++++++++++++++++++++---
1 files changed, 22 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 5adf61a..a028a7d 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
@@ -30,6 +30,7 @@
import com.ycl.service.resources.IVideoResourcesService;
import com.ycl.utils.EasyExcelUtils;
import com.ycl.vo.casePool.QueryForViolationVO;
+import com.ycl.vo.casePool.WorkOrderVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -162,13 +163,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);
@@ -180,6 +181,9 @@
stateList.add(3);
stateList.add(4);
stateList.add(9);
+ break;
+ default:
+ stateList.add(Integer.valueOf(state));
break;
}
if (type == 1) {
@@ -537,4 +541,19 @@
public CommonResult searchCount(@RequestBody VideoInspectParam violationParam) {
return CommonResult.success(baseCaseService.updateCase(violationParam));
}
+
+ @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));
+ }
+
+ @PostMapping("/work_order/export")
+ @ApiOperation("宸ュ崟缁熻-瀵煎嚭")
+ public void getWorkOrderExport(HttpServletResponse response, QueryForViolationParam param) {
+ String sheetName = "宸ュ崟鏁版嵁";
+ EasyExcelUtils.export(response, sheetName, WorkOrderVO.class, baseCaseService.getWorkOrderList(param.getKeyword()));
+ }
}
\ No newline at end of file
--
Gitblit v1.8.0