解决 临时任务 查询不到待办的问题

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/drill/service/impl/CoreDrillTaskServiceImpl.java

@@ -300,7 +300,10 @@ public class CoreDrillTaskServiceImpl extends ServiceImpl<CoreDrillTaskMapper, C
             coreDrillTask.setCreateBy(SecurityUtils.getUserId().toString());
             coreDrillTask.setCreateTime(new Date());
             coreDrillTask.setStartDate(DateUtil.beginOfDay(new Date()));
-            coreDrillTask.setEndDate(DateUtil.endOfDay(new Date()));
+            // 临时添加的任务 特殊把任务的开始结束时间设置为当前时间的一周，否则待办查询不到
+            Long endTime= coreDrillTask.getStartDate().getTime();
+            Date end=new Date(endTime+7*24*60*60*1000-1000);
+            coreDrillTask.setEndDate(end);
         }
         taskToUserMapper.deleteByMap(MapUtil.of("drill_task_id", request.getId()));
         coreDrillTask.setType(request.getType());

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/edu/service/impl/CoreEduTrainingTaskServiceImpl.java

@@ -276,7 +276,10 @@ public class CoreEduTrainingTaskServiceImpl extends ServiceImpl<CoreEduTrainingT
         task.setOrgPath(sysOrg.getPath());
         BeanUtils.copyProperties(request, task);
         task.setStartDate(DateUtil.beginOfDay(new Date()));
-        task.setEndDate(DateUtil.endOfDay(new Date()));
+        Long endTime= (new Date()).getTime();
+        task.setEndDate(DateUtil.endOfDay(new Date(endTime+7*24*60*60*1000-1000)));
+//        task.setEndDate(DateUtil.endOfDay(new Date()));
+
         task.setCreateTime(DateUtils.getNowDate());
         task.setUpdateTime(DateUtils.getNowDate());
         task.setCreateBy(SecurityUtils.getLoginUser().getSysUser().getId().toString());
@@ -323,8 +326,14 @@ public class CoreEduTrainingTaskServiceImpl extends ServiceImpl<CoreEduTrainingT
             coreEduTrainingTask.setOrgName(sysOrg.getShortName());
             coreEduTrainingTask.setOrgPath(sysOrg.getPath());
             coreEduTrainingTask.setTitle(request.getTitle());
-            coreEduTrainingTask.setStartDate(DateUtils.toDate(request.getTrainingStartDateTime()));
-            coreEduTrainingTask.setEndDate(DateUtils.toDate(request.getTrainingEndDateTime()));
+            coreEduTrainingTask.setStartDate(DateUtil.beginOfDay(new Date()));
+            // 临时添加的任务 特殊把任务的开始结束时间设置为当前时间的一周，否则待办查询不到
+            Long endTime=coreEduTrainingTask.getStartDate().getTime();
+            Date end=new Date(endTime+7*24*60*60*1000-1000);
+            coreEduTrainingTask.setEndDate(end);
+//            coreEduTrainingTask.setEndDate(DateUtils.toDate(request.getTrainingEndDateTime()));
+
+
             coreEduTrainingTask.setTrainingStartDateTime(request.getTrainingStartDateTime());
             coreEduTrainingTask.setTrainingEndDateTime(request.getTrainingEndDateTime());
             coreEduTrainingTask.setPlanCycle(EduTrainingPlanCycleEnum.NONE.getCode());