Merge branch 'minhang' of http://222.66.0.204:8090/panzhaov5/bsth_control into minhang

潘钊
2 parents 0f2d89ba bd5dbbd1
Showing 5 changed files with 27 additions and 11 deletions
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
src/main/java/com/bsth/service/report/impl/CulateMileageServiceImpl.java
src/main/java/com/bsth/service/schedule/impl/SchedulePlanServiceImpl.java
src/main/java/com/bsth/service/schedule/rules/ScheduleRuleService.java
src/main/java/com/bsth/service/schedule/rules/ScheduleRuleServiceImpl.java
@@ -2976,7 +2976,6 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
           	            	listS.add(scheduleRealInfo);
           	            }
                     }
-                    listS.add(scheduleRealInfo);
                 }
             }
@@ -3743,6 +3742,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         Double jcyl = 0.0;
         Double yh = 0.0;
         Double jzl = 0.0;
+        Double zlc=0.0;
         List<Ylb> listYlb = ylbRepository.queryListYlb(fcrq, s.getClZbh(), s.getjGh(),xlbm);
         List<Dlb> listDlb = dlbRepository.queryListDlb(fcrq, s.getClZbh(), s.getjGh(),xlbm);
         if(listYlb.size()>0){
@@ -3753,6 +3753,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                 jcyl=Arith.add(jcyl, y.getJzyl());
                 yh =Arith.add(yh ,y.getYh());
                 jzl =Arith.add(jzl, y.getJzl());
+                zlc =Arith.add(zlc, y.getZlc());
             }
         }else{
         	 type=1;
@@ -3762,6 +3763,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                 jcyl=Arith.add(jcyl, d.getJzcd());
                 yh =Arith.add(yh ,d.getHd());
                 jzl =Arith.add(jzl, d.getCdl());
+                zlc =Arith.add(zlc, d.getZlc());
 			}
         }
@@ -3772,7 +3774,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         map.put("ccyl", ccyl);
         map.put("jcyl", jcyl);
         map.put("type", type);
-        
+        map.put("zlc", zlc);
         map.put("xlName", s.getXlName());
         map.put("clZbh", s.getClZbh());
         map.put("plate", BasicData.nbbmCompanyPlateMap.get(s.getClZbh()));
@@ -460,7 +460,21 @@ public class CulateMileageServiceImpl  implements CulateMileageService{
 					if(!time.equals("")){
 						String[] fcsjStr = time.split(":");
 						long fcsj= Long.parseLong(fcsjStr[0])*60+Long.parseLong(fcsjStr[1]);
-						if(childTaskPlans.isEmpty()){
+						if(scheduleRealInfo.getStatus()!=-1){
+							if(item.equals("zgf")){
+								if(fcsj>=zgf1 && fcsj<=zgf2){
+									sjbc++;
+								}
+							}else if(item.equals("wgf")){
+								if(fcsj>=wgf1 && fcsj<=wgf2){
+									sjbc++;
+								}
+							}else{
+								sjbc++;
+							}
+							
+						}
+						/*if(childTaskPlans.isEmpty()){
 							if(scheduleRealInfo.getStatus()!=-1){
 								if(item.equals("zgf")){
 									if(fcsj>=zgf1 && fcsj<=zgf2){
@@ -515,7 +529,7 @@ public class CulateMileageServiceImpl  implements CulateMileageService{
 									sjbc++;
 								}
 							}
-						}
+						}*/
 					}
 				}
 			}
@@ -426,8 +426,8 @@ public class SchedulePlanServiceImpl extends BServiceImpl&lt;SchedulePlan, Long&gt; im
     public SchedulePlan save(SchedulePlan schedulePlan) {
         // pre、如果排班的数据之前已经有了，删除之前的数据
         Date startpre = new Date();
-        scheduleRuleService.deelteSchedulePlanInfo(
-                schedulePlan.getXl().getId(),
+        scheduleRuleService.deleteSchedulePlanInfo(
+                schedulePlan.getXl().getLineCode(),
                 schedulePlan.getScheduleFromTime(),
                 schedulePlan.getScheduleToTime());
         Date endpre = new Date();
@@ -44,11 +44,11 @@ public interface ScheduleRuleService {
     /**
      * 删除指定时间范围的排班明细。
-     * @param xlid 线路id
+     * @param xlbm 线路编码
      * @param datefrom 开始日期
      * @param dateto 结束日期
      */
-    void deelteSchedulePlanInfo(Integer xlid, Date datefrom, Date dateto);
+    void deleteSchedulePlanInfo(String xlbm, Date datefrom, Date dateto);
     /**
      * 查找线路的套跑规则，并封装成规则输入对象。
@@ -137,9 +137,9 @@ public class ScheduleRuleServiceImpl implements ScheduleRuleService {
     }
     @Transactional(propagation = Propagation.REQUIRED, isolation = Isolation.READ_COMMITTED)
-    public void deelteSchedulePlanInfo(Integer xlid, Date datefrom, Date dateto) {
-        String sql = "delete from bsth_c_s_sp_info where xl = ? and schedule_date >= ? and schedule_date <= ?";
-        jdbcTemplate.update(sql, xlid, datefrom, dateto);
+    public void deleteSchedulePlanInfo(String xlbm, Date datefrom, Date dateto) {
+        String sql = "delete from bsth_c_s_sp_info where xl_bm = ? and schedule_date >= ? and schedule_date <= ?";
+        jdbcTemplate.update(sql, xlbm, datefrom, dateto);
     }
     @Override