Merge remote-tracking branch 'origin/master' into master

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

@@ -723,7 +723,7 @@ 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("timeRange")==null?"":((List)map.get("timeRange")).get(0).toString();
+        String startDate = map.get("timeRange")==null? DateUtil.dateToString(new Date()) :((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();
@@ -731,22 +731,28 @@ public class TaskServiceImpl extends SuperServiceImpl<TTaskMapper, TTask> implem
         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).between(StringUtil.isNotEmpty(startDate) && StringUtil.isNotEmpty(endDate), Plan::getCreateTime,DateUtil.getStartTime(startDate), DateUtil.getEndTime(endDate)));
+            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));
-        List<String>dateStrList = new ArrayList<>();
-        for(TTask t:taskList){
-            String date1 = DateUtil.dateToString0(t.getExpectStartTime(),"yyyy-MM-dd");
-            String date2 = DateUtil.dateToString0(t.getExpectEndTime(),"yyyy-MM-dd");
-            if(!dateStrList.contains(date1)){
-                dateStrList.add(date1);
-            }
-            if(!dateStrList.contains(date2)){
-                dateStrList.add(date2);
-            }
-        }
+//        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<>();
+//        for(TTask t:taskList){
+//            String date1 = DateUtil.dateToString0(t.getExpectStartTime(),"yyyy-MM-dd");
+//            String date2 = DateUtil.dateToString0(t.getExpectEndTime(),"yyyy-MM-dd");
+//            if(!dateStrList.contains(date1)){
+//                dateStrList.add(date1);
+//            }
+//            if(!dateStrList.contains(date2)){
+//                dateStrList.add(date2);
+//            }
+//        }
 
 //        String queryDate = StringUtil.changeIdsListToSubQueryStr(dateStrList);
 //        String dateSql = "select * from c_common_date_info where left(date, 10)  in ("+queryDate+") ";
@@ -772,6 +778,8 @@ public class TaskServiceImpl extends SuperServiceImpl<TTaskMapper, TTask> implem
         queryMap.put("draftFlag",draftFlag);
         queryMap.put("planId",planId);
         queryMap.put("planIds",planIds);
+        queryMap.put("startDate", startDate);
+        queryMap.put("endDate", endDate);
         queryMap.put("orgIds", CommonUtil.getOrgIdsStr());
         List<Map> dataList = baseMapper.getTaskList(queryMap);
         Map<String,List<Map>>m = dataList.stream().filter(t->t.get("resourceCode")!=null).collect(Collectors.groupingBy(t->t.get("resourceCode").toString()));
@@ -845,7 +853,7 @@ public class TaskServiceImpl extends SuperServiceImpl<TTaskMapper, TTask> implem
             Map fieldMap = new HashMap();
             fieldMap.put("field", t);
             fieldMap.put("text", dateStr+" "+t);
-            fieldMap.put("id",t);
+            fieldMap.put("id", dateStr+" "+t);
             l.add(fieldMap);
         }
         return l;

imcs-admin-boot/imcs-business-biz/src/main/resources/mapper_business/base/operationManagementCenter/TTaskMapper.xml

@@ -75,6 +75,12 @@
         <if test="draftFlag != null and draftFlag != ''">
             and draft_flag = #{draftFlag}
         </if>
+        <if test="startDate != null and startDate != ''">
+            and expect_start_time &gt;= #{startDate}
+        </if>
+        <if test="endDate != null and endDate != ''">
+            and expect_start_time &lt;= #{endDate}
+        </if>
         <if test="orgIds != null and orgIds != ''">
             and z.org_id in (${orgIds})
         </if>