|
@@ -17,6 +17,7 @@ import com.factory.base.entity.task.FirstCalendar;
|
|
|
import com.factory.base.entity.task.FirstTask;
|
|
|
import com.factory.base.entity.task.OnsiteCalendar;
|
|
|
import com.factory.base.entity.task.OnsiteTask;
|
|
|
+import com.factory.base.util.time.TimeUtils;
|
|
|
import com.factory.mapper.BentelerPlanMapper;
|
|
|
import com.factory.service.FirstTaskService;
|
|
|
import com.factory.service.OnsiteTaskService;
|
|
@@ -115,6 +116,17 @@ public class PlanServiceImpl extends ServiceImpl<BentelerPlanMapper, BentelerPla
|
|
|
List<OnsiteCalendar> cals = null;
|
|
|
for (int typeFlag = 0; typeFlag <= 2; typeFlag++) {
|
|
|
param.put("type_flag", typeFlag);
|
|
|
+ if(typeFlag==1) {
|
|
|
+ LocalDate[] se = TimeUtils.getStartAndEndDay(now, 1, 0);
|
|
|
+ param.put("sday", se[0]);
|
|
|
+ param.put("eday", se[1]);
|
|
|
+ param.put("today", se[1]);
|
|
|
+ }else if(typeFlag==2){
|
|
|
+ LocalDate[] se = TimeUtils.getStartAndEndDay(now, 2, 0);
|
|
|
+ param.put("sday", se[0]);
|
|
|
+ param.put("eday", se[1]);
|
|
|
+ param.put("today", se[1]);
|
|
|
+ }
|
|
|
cals = onsiteTaskService.getCalenderOnsitesForType(param);
|
|
|
log.debug("OT需要生成新任务数量:{}", cals.size());
|
|
|
num = num + cals.size();
|