处理时间查询功能

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/operationManagementCenter/service/impl/TaskServiceImpl.java

@@ -48,6 +48,7 @@ import com.github.zuihou.database.mybatis.conditions.query.LbqWrapper;
 import com.github.zuihou.tenant.service.CodeRuleService;
 import com.google.common.collect.Maps;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.time.DateUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.RedisTemplate;
@@ -729,17 +730,17 @@ public class TaskServiceImpl extends SuperServiceImpl<TTaskMapper, TTask> implem
         String mulPlanStatus = map.get("mulPlanStatus")==null?"":map.get("mulPlanStatus").toString();
         //从排产调度来的，是通过查询计划
         String mulPlanStatusArr[] = StringUtil.isEmpty(mulPlanStatus)?null:mulPlanStatus.split(",");
-        List<Long>planIdList = null;
-        if(mulPlanStatusArr!=null){
-            LbqWrapper<Plan> lbqWrapper = Wraps.<Plan>lbQ().in(Plan::getPlanStatus,mulPlanStatusArr);
-            if(StringUtil.isNotEmpty(endDate)){
-                lbqWrapper.between(true, Plan::getStartTime, DateUtil.getStartTime(startDate), DateUtil.getEndTime(endDate));
-            }else{
-                lbqWrapper.ge(Plan::getStartTime, startDate);
-            }
-            List<Plan>planList = planMapper.selectList(lbqWrapper);
-            planIdList = planList.stream().map(p -> p.getId()).collect(Collectors.toList());
-        }
+//        List<Long>planIdList = null;
+//        if(mulPlanStatusArr!=null){
+//            LbqWrapper<Plan> lbqWrapper = Wraps.<Plan>lbQ().in(Plan::getPlanStatus,mulPlanStatusArr);
+//            if(StringUtil.isNotEmpty(endDate)){
+//                lbqWrapper.between(true, Plan::getStartTime, DateUtil.getStartTime(startDate), DateUtil.getEndTime(endDate));
+//            }else{
+//                lbqWrapper.ge(Plan::getStartTime, startDate);
+//            }
+//            List<Plan>planList = planMapper.selectList(lbqWrapper);
+//            planIdList = planList.stream().map(p -> p.getId()).collect(Collectors.toList());
+//        }
 
 //        List<TTask> taskList = baseMapper.selectList(Wraps.<TTask>lbQ().eq(TTask::getTaskBatchNo,taskBatchNo).eq(TTask::getDraftFlag,draftFlag).eq(TTask::getPlanId,planId).isNotNull(TTask::getExpectStartTime).in(TTask::getPlanId,pArr).in(TTask::getPlanId,planIdList).between(StringUtil.isNotEmpty(startDate) && StringUtil.isNotEmpty(endDate), TTask::getExpectStartTime, DateUtil.getStartTime(startDate), DateUtil.getEndTime(endDate)));
 //        List<String>dateStrList = new ArrayList<>();
@@ -759,7 +760,11 @@ public class TaskServiceImpl extends SuperServiceImpl<TTaskMapper, TTask> implem
 //        List<Map<String,Object>> dateList = scheduleUserDateMapper.selectSql(dateSql);
         List <Map<String,Object>> titleList = null;
         if(StringUtil.isNotEmpty(startDate) && StringUtil.isNotEmpty(endDate)) {
-            titleList = getIntervalTtileList(DateUtil.stringToDate3(startDate), DateUtil.stringToDate3(endDate));
+            if(DateUtils.isSameDay(DateUtil.stringToDate3(startDate), DateUtil.stringToDate3(endDate))) {
+                titleList = getHourTtileList(DateUtil.stringToDate3(startDate));
+            }else{
+                titleList = getIntervalTtileList(DateUtil.stringToDate3(startDate), DateUtil.stringToDate3(endDate));
+            }
         }else{
             titleList = getHourTtileList(null);
         }
@@ -863,7 +868,7 @@ public class TaskServiceImpl extends SuperServiceImpl<TTaskMapper, TTask> implem
         List<Map<String,Object>>l = new ArrayList<Map<String,Object>>();
         Date date = startDate;
         Calendar calendar = Calendar.getInstance();
-        while(!date.equals(endDate)){
+        while(DateUtil.dateDiff(date, endDate)){
             List<Map<String,Object>> dateList = getHourTtileList(date);
             l.addAll(dateList);
             calendar.setTime(date);