update...

潘钊
1 parent fcff3a3a
Showing 3 changed files with 70 additions and 4 deletions
src/main/java/com/bsth/entity/ScheduleRealInfo.java
src/main/java/com/bsth/server_ws/util/WSDataConver.java
src/main/java/com/bsth/server_ws/waybill/entity/SN_lossMileage.java
@@ -151,10 +151,7 @@ public class ScheduleRealInfo implements Serializable{
 	private String qdzArrDatesj;
 	/** 子任务 */
-	@OneToMany(fetch = FetchType.LAZY, cascade = CascadeType.ALL)
-	@JoinTable(name = "bsth_c_s_sp_info_real_c_tasks",
-			joinColumns = @JoinColumn(name = "bsth_c_s_sp_info_real"),
-			inverseJoinColumns = @JoinColumn(name = "c_tasks"))
+	@OneToMany(fetch = FetchType.LAZY, mappedBy = "schedule")
 	private Set<ChildTaskPlan> cTasks = new HashSet<>();
 	/** 关联的公司名称 */
@@ -361,6 +361,8 @@ public class WSDataConver {
             list = listMap.get(lineArray.get(i));
             sch = list.get(0);
+            if(sch.getXlBm().equals("10333"))
+                System.out.println("aaa");
             SN_lossMileage lossMileage = new SN_lossMileage();
             //线路编号
             lossMileage.setLine_id(sch.getXlBm());
@@ -374,6 +376,7 @@ public class WSDataConver {
             lossMileage.setAct_way(ScheduleCalculator.calcYYLC(list));
             //计划公里
             lossMileage.setJh_way(ScheduleCalculator.calcJHLC(list));
+
             //路阻损失公里
             lossMileage.setLoss_lz(ScheduleCalculator.calcCJLC2(list, "路阻"));
             //吊慢损失公里
@@ -392,6 +395,17 @@ public class WSDataConver {
             lossMileage.setLoss_kx(ScheduleCalculator.calcCJLC2(list, "客稀"));
             //其他损失公里
             lossMileage.setLoss_qt(ScheduleCalculator.calcCJLC2(list, "其他"));
+            //配车损失公里
+            lossMileage.setLoss_pc(ScheduleCalculator.calcCJLC2(list, "配车"));
+            //保养损失公里
+            lossMileage.setLoss_by(ScheduleCalculator.calcCJLC2(list, "保养"));
+            //气候损失公里
+            lossMileage.setLoss_qh(ScheduleCalculator.calcCJLC2(list, "气候"));
+            //援外损失公里
+            lossMileage.setLoss_yw(ScheduleCalculator.calcCJLC2(list, "援外"));
+            //抽减损失公里
+            lossMileage.setLoss_cj(ScheduleCalculator.calcCJLC2(list, "抽减"));
+
             //实际班次
             lossMileage.setAct_num(ScheduleCalculator.countSJJHBC(list));
             //早班班次
@@ -54,6 +54,21 @@ public class SN_lossMileage {
     /** 其他损失公里 */
     private double loss_qt;
+    /** 配车损失公里 */
+    private double loss_pc;
+
+    /** 保养损失公里 */
+    private double loss_by;
+
+    /** 气候损失公里 */
+    private double loss_qh;
+
+    /** 援外损失公里 */
+    private double loss_yw;
+
+    /** 抽减损失公里 */
+    private double loss_cj;
+
     /** 实际班次 */
     private int act_num;
@@ -412,4 +427,44 @@ public class SN_lossMileage {
     public void setLoss_gzcs(int loss_gzcs) {
         this.loss_gzcs = loss_gzcs;
     }
+
+    public double getLoss_pc() {
+        return loss_pc;
+    }
+
+    public void setLoss_pc(double loss_pc) {
+        this.loss_pc = loss_pc;
+    }
+
+    public double getLoss_by() {
+        return loss_by;
+    }
+
+    public void setLoss_by(double loss_by) {
+        this.loss_by = loss_by;
+    }
+
+    public double getLoss_qh() {
+        return loss_qh;
+    }
+
+    public void setLoss_qh(double loss_qh) {
+        this.loss_qh = loss_qh;
+    }
+
+    public double getLoss_yw() {
+        return loss_yw;
+    }
+
+    public void setLoss_yw(double loss_yw) {
+        this.loss_yw = loss_yw;
+    }
+
+    public double getLoss_cj() {
+        return loss_cj;
+    }
+
+    public void setLoss_cj(double loss_cj) {
+        this.loss_cj = loss_cj;
+    }
 }