From d76446b35f96da905d9104e2dba1929b780880bf Mon Sep 17 00:00:00 2001
From: dimengzhe <251008545@qq.com>
Date: Fri, 21 Apr 2023 18:10:15 +0800
Subject: [PATCH] =?UTF-8?q?PC=E5=B7=B2=E5=8A=9E=E5=8F=91=E8=B5=B7=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../anrui/flowable/biz/flowtask/FlowTaskService.java  | 10 ++++++++--
 .../yxt/anrui/portal/biz/flow/FlowableService.java    | 11 +++++++++--
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java
index f008682558..625a6bf017 100644
--- a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java
+++ b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java
@@ -517,10 +517,16 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
                 .orderByTaskCreateTime().desc();
         // 查询筛选条件
         if (paramMap.get("startDate") != null && StringUtils.isNotBlank(paramMap.get("startDate").toString())) {
-            taskQuery.taskCreatedAfter(DateUtils.dateStrConvertDate(paramMap.get("startDate").toString(), "yyyy-MM-dd"));
+            LocalDateTime localDateTime = LocalDateTime.ofInstant(Instant.ofEpochMilli(DateUtils.dateStrConvertDate(paramMap.get("startDate").toString(), "yyyy-MM-dd").getTime()), ZoneId.systemDefault());
+            LocalDateTime startOfDay = localDateTime.with(LocalTime.MIN);
+            taskQuery.taskCreatedAfter(Date.from(startOfDay.atZone(ZoneId.systemDefault()).toInstant()));
+//            taskQuery.taskCreatedAfter(DateUtils.dateStrConvertDate(paramMap.get("startDate").toString(), "yyyy-MM-dd"));
         }
         if (paramMap.get("endDate") != null && StringUtils.isNotBlank(paramMap.get("endDate").toString())) {
-            taskQuery.taskCreatedBefore(DateUtils.dateStrConvertDate(paramMap.get("endDate").toString(), "yyyy-MM-dd"));
+            LocalDateTime localDateTime = LocalDateTime.ofInstant(Instant.ofEpochMilli(DateUtils.dateStrConvertDate(paramMap.get("endDate").toString(), "yyyy-MM-dd").getTime()), ZoneId.systemDefault());;
+            LocalDateTime endOfDay = localDateTime.with(LocalTime.MAX);
+            taskQuery.taskCreatedBefore(Date.from(endOfDay.atZone(ZoneId.systemDefault()).toInstant()));
+//            taskQuery.taskCreatedBefore(DateUtils.dateStrConvertDate(paramMap.get("endDate").toString(), "yyyy-MM-dd"));
         }
         /*if (paramMap.get("proDefName") != null && StringUtils.isNotBlank(paramMap.get("proDefName").toString())) {
             taskQuery.processDefinitionNameLike("%" + paramMap.get("proDefName") + "%");
diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/flow/FlowableService.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/flow/FlowableService.java
index 1261d11a2d..5b1e44bb46 100644
--- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/flow/FlowableService.java
+++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/flow/FlowableService.java
@@ -434,17 +434,24 @@ public class FlowableService extends MybatisBaseService<FlowableMapper, Flowable
             taskParam.setSqlOperationSymbol(SQLOperationSymbol.LIKE);
             taskParamList.add(taskParam);
         }
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
         if (StringUtils.isNotBlank(startDate)) {
             BusinessTaskParam taskParam = new BusinessTaskParam();
             taskParam.setField("startDate");
-            taskParam.setValue(startDate);
+            LocalDateTime localDateTime = LocalDateTime.ofInstant(Instant.ofEpochMilli(DateUtils.dateStrConvertDate(startDate, "yyyy-MM-dd").getTime()), ZoneId.systemDefault());
+            LocalDateTime startOfDay = localDateTime.with(LocalTime.MIN);
+//            taskParam.setValue(startDate);
+            taskParam.setValue(startOfDay.format(formatter));
             taskParam.setSqlOperationSymbol(SQLOperationSymbol.GE);
             taskParamList.add(taskParam);
         }
         if (StringUtils.isNotBlank(endDate)) {
             BusinessTaskParam taskParam = new BusinessTaskParam();
             taskParam.setField("endDate");
-            taskParam.setValue(endDate);
+            LocalDateTime localDateTime = LocalDateTime.ofInstant(Instant.ofEpochMilli(DateUtils.dateStrConvertDate(endDate, "yyyy-MM-dd").getTime()), ZoneId.systemDefault());;
+            LocalDateTime endOfDay = localDateTime.with(LocalTime.MAX);
+//            taskParam.setValue(endDate);
+            taskParam.setValue(endOfDay.format(formatter));
             taskParam.setSqlOperationSymbol(SQLOperationSymbol.LE);
             taskParamList.add(taskParam);
         }