lubo пре 3 месеци
родитељ
комит
90ebd66564

+ 18 - 0
ruoyi-line/src/main/java/com/ruoyi/subsidy/service/impl/SubsidyQueueServiceImpl.java

@@ -790,6 +790,24 @@ public class SubsidyQueueServiceImpl implements ISubsidyQueueService {
 
     @Override
     public BigDecimal getStatistics(List<Long> businessIds, SubsidyCountType countType, SubsidyQueueBo bo) {
+        if (ObjectUtil.isNotNull(bo.getConsumeStartTime())) {
+            bo.setConsumeStartTime(DateUtil.beginOfDay(bo.getConsumeStartTime()));
+        }
+        if (ObjectUtil.isNotNull(bo.getConsumeEndTime())) {
+            bo.setConsumeEndTime(DateUtil.endOfDay(bo.getConsumeEndTime()));
+        }
+        if (ObjectUtil.isNotNull(bo.getQueueStartTime())) {
+            bo.setQueueStartTime(DateUtil.beginOfDay(bo.getQueueStartTime()));
+        }
+        if (ObjectUtil.isNotNull(bo.getQueueEndTime())) {
+            bo.setQueueEndTime(DateUtil.endOfDay(bo.getQueueEndTime()));
+        }
+        if (ObjectUtil.isNotNull(bo.getMoveStartTime())) {
+            bo.setMoveStartTime(DateUtil.beginOfDay(bo.getMoveStartTime()));
+        }
+        if (ObjectUtil.isNotNull(bo.getMoveEndTime())) {
+            bo.setMoveEndTime(DateUtil.endOfDay(bo.getMoveEndTime()));
+        }
         if (SubsidyCountType.TODAY_SUBSIDY.equals(countType)) {
             DateTime startTime = DateUtil.beginOfDay(new Date());
             DateTime endTime = DateUtil.endOfDay(new Date());