[update] 更新方案管理-运行计划数据结构

wj-databus/src/main/java/net/wanji/databus/dto/RunningPlanDTO.java

@@ -4,6 +4,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -35,6 +36,8 @@ public class RunningPlanDTO {
     @NoArgsConstructor
     @Data
     public static class TimeListElement {
+        @ApiModelProperty(value = "时段ID", required = true)
+        private Integer sectionId;
         @ApiModelProperty(value = "开始时间", required = true)
         private String startTime;
         @ApiModelProperty(value = "结束时间", required = true)
@@ -43,6 +46,8 @@ public class RunningPlanDTO {
         private String[] startEndTime;
         @ApiModelProperty(value = "方案名", required = true)
         private String schemeName;
+        @ApiModelProperty(value = "被删除的时段ID", required = true)
+        private List<Integer> deletedSectionIds = new ArrayList<>();
     }
 
     @NoArgsConstructor

wj-databus/src/main/resources/mapper/BaseCrossPlanMapper.xml

@@ -35,6 +35,7 @@
         <id column="planNo" property="planNo"/>
         <result column="name" property="name"/>
         <collection property="timeList" ofType="net.wanji.databus.dto.RunningPlanDTO$TimeListElement">
+            <result column="sectionId" property="sectionId"/>
             <result column="startTime" property="startTime"/>
             <result column="endTime" property="endTime"/>
             <result column="schemeName" property="schemeName"/>
@@ -45,6 +46,7 @@
         SELECT
             t1.plan_no as planNo,
             t1.name as name,
+            t2.id as sectionId,
             t2.start_time as startTime,
             t2.end_time as endTime,
             t3.name as schemeName