From 27d0e94396bd5f824012980094d4ff0b27f103c7 Mon Sep 17 00:00:00 2001
From: zhouwentao <1577701412@qq.com>
Date: Tue, 1 Aug 2023 19:16:49 +0800
Subject: [PATCH] updates

---
 .../ocr/controller/OcrIdentifyController.java | 21 ++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/controller/OcrIdentifyController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/controller/OcrIdentifyController.java
index ccf0869..49f17b0 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/controller/OcrIdentifyController.java
+++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/controller/OcrIdentifyController.java
@@ -1,10 +1,7 @@
 package org.jeecg.modules.ocr.controller;
 
 import java.io.File;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -85,10 +82,20 @@ public class OcrIdentifyController extends JeecgController<OcrIdentify, IOcrIden
     @ApiOperation(value = "ocr识别-分页列表查询", notes = "ocr识别-分页列表查询")
     @GetMapping(value = "/list")
     public Result<IPage<OcrIdentify>> queryPageList(OcrIdentify ocrIdentify,
-                                                    @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
-                                                    @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
-                                                    HttpServletRequest req) {
+        @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+        @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+        HttpServletRequest req) {
+        Date startTime=ocrIdentify.getStartTime();
+        Date endTime=ocrIdentify.getEndTime();
+        if (startTime!=null&&endTime!=null) {
+            ocrIdentify.setStartTime(null);
+            ocrIdentify.setEndTime(null);
+        }
         QueryWrapper<OcrIdentify> queryWrapper = QueryGenerator.initQueryWrapper(ocrIdentify, req.getParameterMap());
+        if (startTime!=null&&endTime!=null) {
+            queryWrapper.between("startTime",startTime,endTime);
+            queryWrapper.between("endTime",startTime,endTime);
+        }
         Page<OcrIdentify> page = new Page<OcrIdentify>(pageNo, pageSize);
         Map<String, OcrRuleCheckVo> ocrRuleCheckMap = ocrRuleCheckService.listToMap(null);
         Map<String, OcrMetadataConfigVo> metadataConfigMap = ocrMetadataConfigService.listToMap(null);