PC已办发起时间

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") + "%");

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);
         }