1.

王通
1 parent a97d8a02
Showing 2 changed files with 6 additions and 7 deletions
src/main/java/com/bsth/data/schedule/DayOfSchedule.java
src/main/java/com/bsth/entity/realcontrol/ScheduleRealInfo.java
@@ -366,9 +366,6 @@ public class DayOfSchedule {
                 sch.setScheduleDateStr(fmtyyyyMMdd.print(sch.getScheduleDate().getTime()));
                 sch.setRealExecDate(sch.getScheduleDateStr());
                 sch.setCreateDate(d);
-                if (sch.getStatus() == null) {
-                    sch.setStatus(0);
-                }
  
                 if (StringUtils.isEmpty(sch.getFcsj()))
                     sch.setFcsj("00:00");
@@ -528,6 +525,9 @@ public class DayOfSchedule {
         SchedulePlanInfo sp;
         while (itrab.hasNext()) {
             sp = itrab.next();
+            if (sp.getStatus() == null) {
+                sp.setStatus(0);
+            }
             sp.setSchedulePlan(null);
             sp.setCreateBy(null);
             sp.setUpdateBy(null);
@@ -137,7 +137,7 @@ public class ScheduleRealInfo {
 	private Long zdsjActualTime;
  
 	/**班次状态 0 未执行 1 正在执行 2 已执行 -1 已烂班 */
-	private Integer status;
+	private int status;
  
 	private String adjustExps;
  
@@ -617,11 +617,11 @@ public class ScheduleRealInfo {
 		this.zdsjActualTime = zdsjActualTime;
 	}
  
-	public Integer getStatus() {
+	public int getStatus() {
 		return status;
 	}
  
-	public void setStatus(Integer status) {
+	public void setStatus(int status) {
 		this.status = status;
 	}
  
@@ -830,7 +830,6 @@ public class ScheduleRealInfo {
 	}
  
 	public boolean isDestroy(){
-		if (status == null) status = 0;
 		return this.status == -1;
 	}