|
|
@@ -351,15 +351,16 @@ public class CoreDrillTaskServiceImpl extends ServiceImpl<CoreDrillTaskMapper, C
|
|
|
List<CoreDrillPlanToRole> planRoleList = plan.getPlanRoleList();
|
|
|
List<CoreDrillTask> taskList = new ArrayList<>();
|
|
|
List<CoreDrillTaskToRole> taskRoleList = new ArrayList<>();
|
|
|
+ Map<Integer, DateRange> dateRangeMap = DateUtils.splitDateRange(start, end, plan.getExecTimes());
|
|
|
for (SysOrg org : orgList) {
|
|
|
- for (int i = 0; i < plan.getExecTimes(); i++) {
|
|
|
+ for (int i = 1; i <= plan.getExecTimes(); i++) {
|
|
|
CoreDrillTask trainingTask = new CoreDrillTask();
|
|
|
trainingTask.setId(IdWorker.getId());
|
|
|
trainingTask.setPlanId(plan.getId());
|
|
|
trainingTask.setPlanCycle(plan.getPlanCycle());
|
|
|
trainingTask.setTitle(plan.getPlanName());
|
|
|
- trainingTask.setStartDate(start);
|
|
|
- trainingTask.setEndDate(end);
|
|
|
+ trainingTask.setStartDate(DateUtils.getPreciseTime(dateRangeMap.get(i).getStartTime()));
|
|
|
+ trainingTask.setEndDate(DateUtils.getPreciseTime(dateRangeMap.get(i).getEndTime()));
|
|
|
trainingTask.setPresetCase(null);
|
|
|
trainingTask.setDrillSituation(null);
|
|
|
|