1、修改调度值勤日报，添加预览视图可烂班班次功能，路牌烂班功能，图例更新，预览视图指令界面修正，具体查看相关代码

徐烜
1 parent 635e35c0
Showing 2 changed files with 17 additions and 0 deletions
src/main/java/com/bsth/entity/schedule/SchedulePlanInfo.java
src/main/java/com/bsth/service/schedule/timetable/strategy/impl/TimetableExcelWithPlanInfoViewStrategyImpl.java
@@ -144,6 +144,12 @@ public class SchedulePlanInfo extends BEntity {
     /** 调整的次数（在调度执勤日报页面，排班计划明细里，改的话都会增加） */
     private Integer modifyCount;
+    /*
+        状态字段
+        -1：表示烂班
+     */
+    private Integer status;
+
 //    @ManyToOne(cascade = CascadeType.PERSIST, fetch = FetchType.LAZY)
 //    @JoinTable(
@@ -793,4 +799,12 @@ public class SchedulePlanInfo extends BEntity {
     public void setModifyCount(Integer modifyCount) {
         this.modifyCount = modifyCount;
     }
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
 }
@@ -129,6 +129,9 @@ public class TimetableExcelWithPlanInfoViewStrategyImpl implements TimetableExce
                                 headarrays[c] = content[8]; // 计算的发车站名
                             }
+                            schedulePlanInfo.setModifyCount(Integer.valueOf(content[9])); // 修改次数
+                            schedulePlanInfo.setStatus(Integer.valueOf(content[10])); // status（-1 为烂班）
+
                             schedulePlanInfoList.add(schedulePlanInfo);
                         }