Commit 55a4a539c3c89f0a07f386dac2ef66389d2cbe85
1 parent
38e9b0bc
1.提供给电科所票务系统的接口新加字段
Showing
1 changed file
with
32 additions
and
5 deletions
src/main/java/com/bsth/server_rs/schedule/dto/ScheduleRealInfoDTO_JK.java
| @@ -64,7 +64,7 @@ public class ScheduleRealInfoDTO_JK implements Serializable { | @@ -64,7 +64,7 @@ public class ScheduleRealInfoDTO_JK implements Serializable { | ||
| 64 | this.sflj = sch.isSflj(); | 64 | this.sflj = sch.isSflj(); |
| 65 | this.remarks = sch.getRemarks(); | 65 | this.remarks = sch.getRemarks(); |
| 66 | this.cTasks = sch.getcTasks(); | 66 | this.cTasks = sch.getcTasks(); |
| 67 | - this.updateDate = sch.getUpdateDate(); | 67 | + this.updateDate = sch.getUpdateDate().getTime(); |
| 68 | } | 68 | } |
| 69 | 69 | ||
| 70 | private Long id; | 70 | private Long id; |
| @@ -181,13 +181,16 @@ public class ScheduleRealInfoDTO_JK implements Serializable { | @@ -181,13 +181,16 @@ public class ScheduleRealInfoDTO_JK implements Serializable { | ||
| 181 | */ | 181 | */ |
| 182 | private String remarks; | 182 | private String remarks; |
| 183 | 183 | ||
| 184 | + private Double oilConsum; | ||
| 185 | + private Double elecConsum; | ||
| 186 | + private Double h2Consum; | ||
| 187 | + private Long updateDate; | ||
| 188 | + | ||
| 184 | /** | 189 | /** |
| 185 | * 子任务 | 190 | * 子任务 |
| 186 | */ | 191 | */ |
| 187 | private Set<ChildTaskPlan> cTasks; | 192 | private Set<ChildTaskPlan> cTasks; |
| 188 | 193 | ||
| 189 | - private Date updateDate; | ||
| 190 | - | ||
| 191 | public Long getId() { | 194 | public Long getId() { |
| 192 | return id; | 195 | return id; |
| 193 | } | 196 | } |
| @@ -404,11 +407,35 @@ public class ScheduleRealInfoDTO_JK implements Serializable { | @@ -404,11 +407,35 @@ public class ScheduleRealInfoDTO_JK implements Serializable { | ||
| 404 | this.upDown = upDown; | 407 | this.upDown = upDown; |
| 405 | } | 408 | } |
| 406 | 409 | ||
| 407 | - public Date getUpdateDate() { | 410 | + public Double getOilConsum() { |
| 411 | + return oilConsum; | ||
| 412 | + } | ||
| 413 | + | ||
| 414 | + public void setOilConsum(Double oilConsum) { | ||
| 415 | + this.oilConsum = oilConsum; | ||
| 416 | + } | ||
| 417 | + | ||
| 418 | + public Double getElecConsum() { | ||
| 419 | + return elecConsum; | ||
| 420 | + } | ||
| 421 | + | ||
| 422 | + public void setElecConsum(Double elecConsum) { | ||
| 423 | + this.elecConsum = elecConsum; | ||
| 424 | + } | ||
| 425 | + | ||
| 426 | + public Double getH2Consum() { | ||
| 427 | + return h2Consum; | ||
| 428 | + } | ||
| 429 | + | ||
| 430 | + public void setH2Consum(Double h2Consum) { | ||
| 431 | + this.h2Consum = h2Consum; | ||
| 432 | + } | ||
| 433 | + | ||
| 434 | + public Long getUpdateDate() { | ||
| 408 | return updateDate; | 435 | return updateDate; |
| 409 | } | 436 | } |
| 410 | 437 | ||
| 411 | - public void setUpdateDate(Date updateDate) { | 438 | + public void setUpdateDate(Long updateDate) { |
| 412 | this.updateDate = updateDate; | 439 | this.updateDate = updateDate; |
| 413 | } | 440 | } |
| 414 | } | 441 | } |