Commit 2a9c4318 authored by duanruiming's avatar duanruiming

[update] 优化调度编号

parent ba3ccc42
...@@ -24,6 +24,10 @@ public class ScheduleSendVO { ...@@ -24,6 +24,10 @@ public class ScheduleSendVO {
@Setter @Setter
@Getter @Getter
public static class Schedule { public static class Schedule {
/**
* 调度号
*/
private String scheduleNo;
/** /**
* 星期列表 * 星期列表
*/ */
......
...@@ -204,7 +204,7 @@ public class ControlCommandStrategyServiceImpl implements ControlCommandStrategy ...@@ -204,7 +204,7 @@ public class ControlCommandStrategyServiceImpl implements ControlCommandStrategy
schedulesPO.setName("工作日"); schedulesPO.setName("工作日");
} }
schedulesPO.setCrossId(scheduleSendVO.getCrossCode()); schedulesPO.setCrossId(scheduleSendVO.getCrossCode());
schedulesPO.setScheduleNo(schedule.getScheduleId()); schedulesPO.setScheduleNo(Integer.valueOf(schedule.getScheduleNo()));
schedulesPO.setPlanId(week.getPlanNo()); schedulesPO.setPlanId(week.getPlanNo());
schedulesPO.setWeek(week.getWeekNum()); schedulesPO.setWeek(week.getWeekNum());
schedulesPO.setSpecialDate(null); schedulesPO.setSpecialDate(null);
...@@ -212,7 +212,7 @@ public class ControlCommandStrategyServiceImpl implements ControlCommandStrategy ...@@ -212,7 +212,7 @@ public class ControlCommandStrategyServiceImpl implements ControlCommandStrategy
}); });
schedule.getSpecialDays().forEach(specialDay -> { schedule.getSpecialDays().forEach(specialDay -> {
CrossSchedulesPO schedulesPO = new CrossSchedulesPO(); CrossSchedulesPO schedulesPO = new CrossSchedulesPO();
schedulesPO.setScheduleNo(schedule.getScheduleId()); schedulesPO.setScheduleNo(Integer.valueOf(schedule.getScheduleNo()));
schedulesPO.setName("特殊日期"); schedulesPO.setName("特殊日期");
schedulesPO.setCrossId(scheduleSendVO.getCrossCode()); schedulesPO.setCrossId(scheduleSendVO.getCrossCode());
schedulesPO.setPlanId(specialDay.getPlanNo()); schedulesPO.setPlanId(specialDay.getPlanNo());
......
...@@ -32,9 +32,9 @@ public class ScheduleSendVO { ...@@ -32,9 +32,9 @@ public class ScheduleSendVO {
public static class Schedule { public static class Schedule {
/** /**
* 调度号 [1-128] 不填写自动分配 * 调度号
*/ */
private Integer scheduleId; private String scheduleNo;
/** /**
* 星期列表 * 星期列表
*/ */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment