From 11df7ebba15fb134a1ee083a714c89bf2219c917 Mon Sep 17 00:00:00 2001
From: hongawen <83944980@qq.com>
Date: Tue, 4 Jun 2024 13:49:25 +0800
Subject: [PATCH] =?UTF-8?q?=E6=88=91=E5=8F=91=E8=B5=B7=E7=9A=84=E8=8F=9C?=
 =?UTF-8?q?=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../task/impl/BpmProcessInstanceServiceImpl.java     |  5 +++--
 .../bpm/service/task/impl/BpmTaskServiceImpl.java    | 12 ++++++------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/pqs-bpm/bpm-boot/src/main/java/com/njcn/bpm/service/task/impl/BpmProcessInstanceServiceImpl.java b/pqs-bpm/bpm-boot/src/main/java/com/njcn/bpm/service/task/impl/BpmProcessInstanceServiceImpl.java
index 36daa1063..eb42d5e2a 100644
--- a/pqs-bpm/bpm-boot/src/main/java/com/njcn/bpm/service/task/impl/BpmProcessInstanceServiceImpl.java
+++ b/pqs-bpm/bpm-boot/src/main/java/com/njcn/bpm/service/task/impl/BpmProcessInstanceServiceImpl.java
@@ -20,6 +20,7 @@ import com.njcn.bpm.utils.BpmProcessInstanceConvert;
 import com.njcn.bpm.utils.CollectionUtils;
 import com.njcn.bpm.utils.DateUtils;
 import com.njcn.common.pojo.exception.BusinessException;
+import com.njcn.common.utils.PubUtils;
 import com.njcn.user.api.UserFeignClient;
 import com.njcn.user.pojo.po.User;
 import com.njcn.user.pojo.vo.UserVO;
@@ -135,9 +136,9 @@ public class BpmProcessInstanceServiceImpl implements IBpmProcessInstanceService
         String beginTimeStr = bpmProcessInstancePageParam.getSearchBeginTime();
         String endTimeStr = bpmProcessInstancePageParam.getSearchEndTime();
         LocalDateTime beginTime = LocalDateTimeUtil.parse(beginTimeStr, DatePattern.NORM_DATE_PATTERN);
-        LocalDateTime endTime = LocalDateTimeUtil.parse(endTimeStr, DatePattern.NORM_DATE_PATTERN);
-        processInstanceQuery.startedAfter(DateUtils.of(beginTime));
+        LocalDateTime endTime = PubUtils.endTimeToLocalDateTime(endTimeStr);
         processInstanceQuery.startedBefore(DateUtils.of(endTime));
+        processInstanceQuery.startedAfter(DateUtils.of(beginTime));
         // 查询数量
         long processInstanceCount = processInstanceQuery.count();
         if (processInstanceCount == 0) {
diff --git a/pqs-bpm/bpm-boot/src/main/java/com/njcn/bpm/service/task/impl/BpmTaskServiceImpl.java b/pqs-bpm/bpm-boot/src/main/java/com/njcn/bpm/service/task/impl/BpmTaskServiceImpl.java
index 281181333..4b58efcd1 100644
--- a/pqs-bpm/bpm-boot/src/main/java/com/njcn/bpm/service/task/impl/BpmTaskServiceImpl.java
+++ b/pqs-bpm/bpm-boot/src/main/java/com/njcn/bpm/service/task/impl/BpmTaskServiceImpl.java
@@ -98,12 +98,12 @@ public class BpmTaskServiceImpl implements IBpmTaskService {
         if (StrUtil.isNotBlank(bpmTaskQueryParam.getSearchValue())) {
             taskQuery.taskNameLike("%" + bpmTaskQueryParam.getSearchValue() + "%");
         }
-        String beginTimeStr = bpmTaskQueryParam.getSearchBeginTime();
-        String endTimeStr = bpmTaskQueryParam.getSearchEndTime();
-        LocalDateTime beginTime = LocalDateTimeUtil.parse(beginTimeStr, DatePattern.NORM_DATE_PATTERN);
-        LocalDateTime endTime = PubUtils.endTimeToLocalDateTime(endTimeStr);
-        taskQuery.taskCreatedBefore(DateUtils.of(endTime));
-        taskQuery.taskCreatedAfter(DateUtils.of(beginTime));
+//        String beginTimeStr = bpmTaskQueryParam.getSearchBeginTime();
+//        String endTimeStr = bpmTaskQueryParam.getSearchEndTime();
+//        LocalDateTime beginTime = LocalDateTimeUtil.parse(beginTimeStr, DatePattern.NORM_DATE_PATTERN);
+//        LocalDateTime endTime = PubUtils.endTimeToLocalDateTime(endTimeStr);
+//        taskQuery.taskCreatedBefore(DateUtils.of(endTime));
+//        taskQuery.taskCreatedAfter(DateUtils.of(beginTime));
         long count = taskQuery.count();
         if (count == 0) {
             return PageResult.empty();