排产调度资源页面功能补全

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

@@ -723,15 +723,15 @@ public class TaskServiceImpl extends SuperServiceImpl<TTaskMapper, TTask> implem
         String planId = map.get("planId")==null?"":map.get("planId").toString();
         String planIds = map.get("planIds")==null?"":map.get("planIds").toString();
         String pArr[] = map.get("planIds")==null?null:planIds.split(",");
-//        String startDate = map.get("startDate")==null?"":map.get("startDate").toString();
-//        String endDate = map.get("endDate")==null?"":map.get("endDate").toString();
+        String startDate = map.get("timeRange")==null?"":((List)map.get("timeRange")).get(0).toString();
+        String endDate = map.get("timeRange")==null?"":((List)map.get("timeRange")).get(1).toString();
 
         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){
-            List<Plan>planList = planMapper.selectList(Wraps.<Plan>lbQ().in(Plan::getPlanStatus,mulPlanStatusArr));
+            List<Plan>planList = planMapper.selectList(Wraps.<Plan>lbQ().in(Plan::getPlanStatus,mulPlanStatusArr).between(StringUtil.isNotEmpty(startDate) && StringUtil.isNotEmpty(endDate), Plan::getCreateTime,DateUtil.getStartTime(startDate), DateUtil.getEndTime(endDate)));
             planIdList = planList.stream().map(p -> p.getId()).collect(Collectors.toList());
         }
 
@@ -751,8 +751,12 @@ public class TaskServiceImpl extends SuperServiceImpl<TTaskMapper, TTask> implem
 //        String queryDate = StringUtil.changeIdsListToSubQueryStr(dateStrList);
 //        String dateSql = "select * from c_common_date_info where left(date, 10)  in ("+queryDate+") ";
 //        List<Map<String,Object>> dateList = scheduleUserDateMapper.selectSql(dateSql);
-        List <Map<String,Object>>titleList = getHourTtileList(null);
-
+        List <Map<String,Object>> titleList = null;
+        if(StringUtil.isNotEmpty(startDate) && StringUtil.isNotEmpty(endDate)) {
+            titleList = getIntervalTtileList(DateUtil.stringToDate3(startDate), DateUtil.stringToDate3(endDate));
+        }else{
+            titleList = getHourTtileList(null);
+        }
 
         List<Map>returnList = new ArrayList<Map>();
 
@@ -784,12 +788,6 @@ public class TaskServiceImpl extends SuperServiceImpl<TTaskMapper, TTask> implem
             returnList.add(returnMap);
         }
 
-//        for(Map map1:dataList){
-//            Map returnMap = new HashMap();
-//            returnMap.put("code",);
-//
-//        }
-
         //获取数据
         Map<String, Object> retMap = new HashMap<String, Object>();
         retMap.put("titleList",titleList);
@@ -832,8 +830,7 @@ public class TaskServiceImpl extends SuperServiceImpl<TTaskMapper, TTask> implem
         return l;
     }
 
-
-    static  List<Map<String,Object>>getHourTtileList(Date date){
+    public  List<Map<String,Object>>getHourTtileList(Date date){
         List<Map<String,Object>>l = new ArrayList<Map<String,Object>>();
         boolean b =true;
         String dateStr =  DateUtil.dateToString(date==null? new Date() : date);
@@ -854,6 +851,22 @@ public class TaskServiceImpl extends SuperServiceImpl<TTaskMapper, TTask> implem
         return l;
     }
 
+    public  List<Map<String,Object>>getIntervalTtileList(Date startDate, Date endDate){
+        List<Map<String,Object>>l = new ArrayList<Map<String,Object>>();
+        Date date = startDate;
+        Calendar calendar = Calendar.getInstance();
+        while(!date.equals(endDate)){
+            List<Map<String,Object>> dateList = getHourTtileList(date);
+            l.addAll(dateList);
+            calendar.setTime(date);
+            calendar.add(Calendar.DATE, 1);
+            date = calendar.getTime();
+        }
+        return l;
+    }
+
+
+
     /**
      * 算法分配准备，准备好数据，准备调用
      * @param task