定时中不在计算班次准点率

临加空驶公里计算

定时中不在计算班次准点率
临加空驶公里计算
廖磊
1 parent 10983d1d
Showing 5 changed files with 43 additions and 18 deletions
src/main/java/com/bsth/data/schedule/thread/CalcOilThread.java
src/main/java/com/bsth/service/report/impl/CulateMileageServiceImpl.java
src/main/resources/static/pages/forms/mould/statisticsDaily_3.xls
src/main/resources/static/pages/forms/statement/statisticsDaily.html
src/main/resources/static/pages/mforms/singledatas/singledata.html
@@ -44,7 +44,7 @@ public class CalcOilThread extends Thread{
             dlbService.obtainDsq();
             logger.info("计算路单里程加注量结束！");
             logger.info("开始计算班次准点率....");
-            sheetService.saveSheetList("");
+            //sheetService.saveSheetList("");
             logger.info("计算班次准点率结束！");
  
             logger.info("开始保存重新统计数据....");
@@ -1647,22 +1647,47 @@ public class CulateMileageServiceImpl  implements CulateMileageService{
 				}
 			}else{
 				Set<ChildTaskPlan> childTaskPlans = t.getcTasks();
-				if(!childTaskPlans.isEmpty()){
-					Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
-	                while (it.hasNext()) {
-	                    ChildTaskPlan childTaskPlan = it.next();
-	                    if(childTaskPlan.getCcId()==null){
-		                    if("empty".equals(childTaskPlan.getMileageType())&&"临加".equals(childTaskPlan.getType1())){
-		                    	 if (!childTaskPlan.isDestroy()) {
-		 	                    	Float jhgl=childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage();
-		 	                    	ljks=Arith.add(ljks,jhgl);
-		 	                    } 
+				if(isInOut(t)){
+					if(childTaskPlans.isEmpty()){
+						double jhlc=t.getJhlc()==null?0:t.getJhlc();
+						double jhlcOrig=t.getJhlcOrig()==null?0:t.getJhlcOrig();
+						double zjlc=Arith.sub(jhlc, jhlcOrig);
+						if(zjlc>0){
+							ljks=Arith.add(zjlc, ljks);
+						}
+					}else{
+						Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
+						while (it.hasNext()) {
+		                    ChildTaskPlan childTaskPlan = it.next();
+		                    if(childTaskPlan.getCcId()==null){
+			                    if("empty".equals(childTaskPlan.getMileageType())&&"临加".equals(childTaskPlan.getType1())){
+			                    	 if (!childTaskPlan.isDestroy()) {
+			 	                    	Float jhgl=childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage();
+			 	                    	ljks=Arith.add(ljks,jhgl);
+			 	                    } 
+			                    }
 		                    }
-	                    }
-	                }
+		                }
+					}
+					
+				}else{
+					if(!childTaskPlans.isEmpty()){
+						Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
+		                while (it.hasNext()) {
+		                    ChildTaskPlan childTaskPlan = it.next();
+		                    if(childTaskPlan.getCcId()==null){
+			                    if("empty".equals(childTaskPlan.getMileageType())&&"临加".equals(childTaskPlan.getType1())){
+			                    	 if (!childTaskPlan.isDestroy()) {
+			 	                    	Float jhgl=childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage();
+			 	                    	ljks=Arith.add(ljks,jhgl);
+			 	                    } 
+			                    }
+		                    }
+		                }
+					}
 				}
-			
 			}
+			
 		}
 		return ljks;
 	}
@@ -307,7 +307,7 @@
 			}else if(time2<time1){
 				layer.msg('结束日期不能小于开始日期.');
 			}else{
-				if((time2-time1>2678400000){
+				if((time2-time1)>2678400000){
 					layer.msg('查询超过一个月请点击【统计查询】.');
 				}else{
 					$("#tjrq").html(date+"至"+date2);
@@ -351,7 +351,7 @@
 			 params['xlName'] = xlName;
 			 params['nature'] = nature;
 			 params['type'] = "export";
-			 if(time2-time1>2678400000){
+			 if((time2-time1)>2678400000){
 					layer.msg('查询超过一个月请点击【统计查询】.');
 			}else{
 				var i = layer.load(2);
@@ -192,8 +192,8 @@
 				var temp = tempData[$("#line").val()].split(":");
 				$("#gsdmSing").val(temp[0]);
 				updateCompany();
-// 				$("#fgsdmSing").val(temp[1]);
-				$("#fgsdmSing").val("");
+				$("#fgsdmSing").val(temp[1]);
+// 				$("#fgsdmSing").val("");
 				$("#gsdmSing").attr("disabled", true);
 // 				$("#fgsdmSing").attr("disabled", true);
 			}