From a235b507d42ffd7e27b920fa88291bd08cbfd234 Mon Sep 17 00:00:00 2001 From: DELL Date: Sat, 30 Mar 2024 12:21:34 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E5=B7=A5=E5=85=B7=E7=B1=BB=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E6=97=B6=E9=97=B4=E6=A0=BC=E5=BC=8F=EF=BC=8C=E6=88=91?= =?UTF-8?q?=E7=9A=84=E7=BB=88=E5=AE=A1=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=5F=E6=97=B6=E9=97=B4=E6=9F=A5=E8=AF=A2=5F=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E6=A0=BC=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/jyjz/flowable/controller/FlowTaskController.java | 6 +++--- .../java/cn/jyjz/xiaoyao/ocr/util/SearchParaFormatting.java | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/flowable/controller/FlowTaskController.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/flowable/controller/FlowTaskController.java index 8c443443..1f0c8b2d 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/flowable/controller/FlowTaskController.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/flowable/controller/FlowTaskController.java @@ -414,13 +414,13 @@ public class FlowTaskController extends BaseController { String[] dateRange = izuptime.split("-"); if (dateRange.length == 2) { try { - SimpleDateFormat sdfInput = new SimpleDateFormat("yyyy/MM/dd"); + SimpleDateFormat sdfInput = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss"); // 解析开始时间 - Long startTimeStamp = sdfInput.parse(dateRange[0].trim()).getTime(); + Long startTimeStamp = sdfInput.parse(dateRange[0].trim() + " 00:00:00").getTime(); // 解析结束时间 - Long endTimeStamp = sdfInput.parse(dateRange[1].trim()).getTime(); + Long endTimeStamp = sdfInput.parse(dateRange[1].trim() + " 23:59:59").getTime(); // 如果开始时间不为空，则将其放入查询条件中 if (startTimeStamp != null) { diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/util/SearchParaFormatting.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/util/SearchParaFormatting.java index 4dded098..029f8224 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/util/SearchParaFormatting.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/util/SearchParaFormatting.java @@ -76,7 +76,7 @@ public class SearchParaFormatting { //格式化时间数据 String[] times =searchValue.trim().replaceAll("\\s+", "").split("-"); beginTime = DateUtil.parse(times[0],"yyyy/MM/dd"); - endTime = DateUtil.parse(times[1],"yyyy/MM/dd"); + endTime = DateUtil.parse(times[1]+" 23:59:59","yyyy/MM/dd HH:mm:ss"); break; default: }