Commit c9e2ea9648589b484e4baaf00a503f989a08ad2d
1 parent
701de6e7
update
Showing
1 changed file
with
4 additions
and
40 deletions
src/main/java/com/bsth/entity/realcontrol/ScheduleRealInfo.java
| @@ -47,11 +47,6 @@ public class ScheduleRealInfo { | @@ -47,11 +47,6 @@ public class ScheduleRealInfo { | ||
| 47 | 47 | ||
| 48 | /** 车辆自编号 */ | 48 | /** 车辆自编号 */ |
| 49 | private String clZbh; | 49 | private String clZbh; |
| 50 | - | ||
| 51 | - /** 报道时间(格式 HH:mm) | ||
| 52 | - private String bdTime; */ | ||
| 53 | - /** 出场时间(格式 HH:mm) | ||
| 54 | - private String ccTime;*/ | ||
| 55 | 50 | ||
| 56 | /** 驾驶员工号 */ | 51 | /** 驾驶员工号 */ |
| 57 | private String jGh; | 52 | private String jGh; |
| @@ -141,15 +136,6 @@ public class ScheduleRealInfo { | @@ -141,15 +136,6 @@ public class ScheduleRealInfo { | ||
| 141 | @Transient | 136 | @Transient |
| 142 | private boolean late; | 137 | private boolean late; |
| 143 | 138 | ||
| 144 | - /**实际里程*/ | ||
| 145 | - private Float realMileage; | ||
| 146 | - | ||
| 147 | - /** 增加公里 */ | ||
| 148 | - private Float addMileage; | ||
| 149 | - | ||
| 150 | - /** 抽减公里 */ | ||
| 151 | - private Float remMileage; | ||
| 152 | - | ||
| 153 | /** 备注*/ | 139 | /** 备注*/ |
| 154 | private String remarks; | 140 | private String remarks; |
| 155 | 141 | ||
| @@ -167,11 +153,13 @@ public class ScheduleRealInfo { | @@ -167,11 +153,13 @@ public class ScheduleRealInfo { | ||
| 167 | private Integer opDirectiveState; | 153 | private Integer opDirectiveState; |
| 168 | 154 | ||
| 169 | /** 起点站计划到达时间 */ | 155 | /** 起点站计划到达时间 */ |
| 156 | + @Transient | ||
| 170 | private String qdzArrDatejh; | 157 | private String qdzArrDatejh; |
| 171 | - | 158 | + |
| 172 | /** 起点站实际到达时间 */ | 159 | /** 起点站实际到达时间 */ |
| 160 | + @Transient | ||
| 173 | private String qdzArrDatesj; | 161 | private String qdzArrDatesj; |
| 174 | - | 162 | + |
| 175 | /** 子任务 */ | 163 | /** 子任务 */ |
| 176 | @OneToMany(fetch = FetchType.LAZY/*, cascade = CascadeType.ALL*/) | 164 | @OneToMany(fetch = FetchType.LAZY/*, cascade = CascadeType.ALL*/) |
| 177 | private Set<ChildTaskPlan> cTasks = new HashSet<>(); | 165 | private Set<ChildTaskPlan> cTasks = new HashSet<>(); |
| @@ -566,30 +554,6 @@ public class ScheduleRealInfo { | @@ -566,30 +554,6 @@ public class ScheduleRealInfo { | ||
| 566 | this.status = status; | 554 | this.status = status; |
| 567 | } | 555 | } |
| 568 | 556 | ||
| 569 | - public Float getRealMileage() { | ||
| 570 | - return realMileage; | ||
| 571 | - } | ||
| 572 | - | ||
| 573 | - public void setRealMileage(Float realMileage) { | ||
| 574 | - this.realMileage = realMileage; | ||
| 575 | - } | ||
| 576 | - | ||
| 577 | - public Float getAddMileage() { | ||
| 578 | - return addMileage; | ||
| 579 | - } | ||
| 580 | - | ||
| 581 | - public void setAddMileage(Float addMileage) { | ||
| 582 | - this.addMileage = addMileage; | ||
| 583 | - } | ||
| 584 | - | ||
| 585 | - public Float getRemMileage() { | ||
| 586 | - return remMileage; | ||
| 587 | - } | ||
| 588 | - | ||
| 589 | - public void setRemMileage(Float remMileage) { | ||
| 590 | - this.remMileage = remMileage; | ||
| 591 | - } | ||
| 592 | - | ||
| 593 | public String getRemarks() { | 557 | public String getRemarks() { |
| 594 | return remarks; | 558 | return remarks; |
| 595 | } | 559 | } |