Commit c41398eb4e153550386b045f27a756313805ce7b

Authored by 徐烜
1 parent 635e35c0

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

Too many changes to show.

To preserve performance only 2 of 12 files are displayed.

src/main/java/com/bsth/entity/schedule/SchedulePlanInfo.java
... ... @@ -144,6 +144,12 @@ public class SchedulePlanInfo extends BEntity {
144 144 /** 调整的次数(在调度执勤日报页面,排班计划明细里,改的话都会增加) */
145 145 private Integer modifyCount;
146 146  
  147 + /*
  148 + 状态字段
  149 + -1:表示烂班
  150 + */
  151 + private Integer status;
  152 +
147 153  
148 154 // @ManyToOne(cascade = CascadeType.PERSIST, fetch = FetchType.LAZY)
149 155 // @JoinTable(
... ... @@ -793,4 +799,12 @@ public class SchedulePlanInfo extends BEntity {
793 799 public void setModifyCount(Integer modifyCount) {
794 800 this.modifyCount = modifyCount;
795 801 }
  802 +
  803 + public Integer getStatus() {
  804 + return status;
  805 + }
  806 +
  807 + public void setStatus(Integer status) {
  808 + this.status = status;
  809 + }
796 810 }
... ...
src/main/java/com/bsth/service/schedule/timetable/strategy/impl/TimetableExcelWithPlanInfoViewStrategyImpl.java
... ... @@ -129,6 +129,9 @@ public class TimetableExcelWithPlanInfoViewStrategyImpl implements TimetableExce
129 129 headarrays[c] = content[8]; // 计算的发车站名
130 130 }
131 131  
  132 + schedulePlanInfo.setModifyCount(Integer.valueOf(content[9])); // 修改次数
  133 + schedulePlanInfo.setStatus(Integer.valueOf(content[10])); // status(-1 为烂班)
  134 +
132 135 schedulePlanInfoList.add(schedulePlanInfo);
133 136 }
134 137  
... ...