Pārlūkot izejas kodu

update 更新app运单看版列表时间判断

chenlin 2 gadi atpakaļ
vecāks
revīzija
2a244b972f

+ 3 - 3
sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/WaybillManagementService.java

@@ -9,6 +9,7 @@ import com.sckw.core.model.enums.CarWaybillQueryEnum;
 import com.sckw.core.model.page.PageResult;
 import com.sckw.core.utils.BeanUtils;
 import com.sckw.core.utils.CollectionUtils;
+import com.sckw.core.utils.StringTimeUtil;
 import com.sckw.core.utils.StringUtils;
 import com.sckw.core.web.context.LoginUserHolder;
 import com.sckw.core.web.response.HttpResult;
@@ -790,10 +791,9 @@ public class WaybillManagementService {
         }
         // 查询时间段
         if (Objects.nonNull(query.getStartDate()) && Objects.nonNull(query.getEndDate())) {
-            Date endDate = DateUtil.strDateTimeToDateTime(query.getEndDate());
             criteria.and("createTime")
-                    .gte(DateUtil.strDateTimeToDateTime(query.getStartDate()))
-                    .lte(DateUtil.offsetDay(endDate, 1));
+                    .gte(DateUtil.strDateTimeToDateTime(StringTimeUtil.fillStart(query.getStartDate())))
+                    .lte(DateUtil.strDateTimeToDateTime(StringTimeUtil.fillEnd(query.getEndDate())));
         }
         Query queryFormat = new Query(criteria);
         // 总记录数