移动端已办发起时间

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/flow/FlowableService.java

@@ -51,6 +51,7 @@ import com.yxt.anrui.portal.biz.appsubsetversion.AppSubsetVersionService;
 import com.yxt.common.base.config.component.FileUploadComponent;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.ConstantUtils;
+import com.yxt.common.base.utils.DateUtils;
 import com.yxt.common.base.utils.StringUtils;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
@@ -58,6 +59,11 @@ import com.yxt.common.core.vo.PagerVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.time.Instant;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.ZoneId;
+import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -616,21 +622,28 @@ public class FlowableService extends MybatisBaseService<FlowableMapper, Flowable
             taskParamList.add(taskParam);
         }
         String date = params.getDate();
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
         if(StringUtils.isNotBlank(date)){
             String[] s = date.split("至");
             String startDate = s[0];
             if (StringUtils.isNotBlank(startDate)) {
+                LocalDateTime localDateTime = LocalDateTime.ofInstant(Instant.ofEpochMilli(DateUtils.dateStrConvertDate(startDate, "yyyy-MM-dd").getTime()), ZoneId.systemDefault());
+                LocalDateTime startOfDay = localDateTime.with(LocalTime.MIN);
                 BusinessTaskParam taskParam = new BusinessTaskParam();
                 taskParam.setField("startDate");
-                taskParam.setValue(startDate);
+//                taskParam.setValue(startDate);
+                taskParam.setValue(startOfDay.format(formatter));
                 taskParam.setSqlOperationSymbol(SQLOperationSymbol.GE);
                 taskParamList.add(taskParam);
             }
             String endDate = s[1];
             if (StringUtils.isNotBlank(endDate)) {
+                LocalDateTime localDateTime = LocalDateTime.ofInstant(Instant.ofEpochMilli(DateUtils.dateStrConvertDate(endDate, "yyyy-MM-dd").getTime()), ZoneId.systemDefault());;
+                LocalDateTime endOfDay = localDateTime.with(LocalTime.MAX);
                 BusinessTaskParam taskParam = new BusinessTaskParam();
                 taskParam.setField("endDate");
-                taskParam.setValue(endDate);
+//                taskParam.setValue(endDate);
+                taskParam.setValue(endOfDay.format(formatter));
                 taskParam.setSqlOperationSymbol(SQLOperationSymbol.LE);
                 taskParamList.add(taskParam);
             }