From e1a5409bfa2cca009160a961d9bff827ff133b1b Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期一, 05 一月 2026 17:55: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 | 8 +++++---
1 files changed, 5 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 7acfe0e..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
@@ -562,14 +562,16 @@
@ApiOperation("宸ュ崟缁熻")
public CommonResult getWorkOrder(@RequestParam Integer currentPage,
@RequestParam Integer pageSize,
- @RequestParam(required = false) String keyword) {
- return CommonResult.success(baseCaseService.getWorkOrder(currentPage, pageSize, keyword));
+ @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