油，电总计修改

审计报表修改工作汇总修改加油人员不符修改

油，电总计修改
审计报表修改工作汇总修改加油人员不符修改
廖磊
1 parent cfedcce3
Showing 11 changed files with 262 additions and 213 deletions
src/main/java/com/bsth/service/oil/impl/DlbServiceImpl.java
src/main/java/com/bsth/service/oil/impl/YlbServiceImpl.java
src/main/java/com/bsth/service/oil/impl/YlxxbServiceImpl.java
src/main/java/com/bsth/service/report/impl/CulateMileageServiceImpl.java
src/main/java/com/bsth/service/report/impl/ReportServiceImpl.java
src/main/resources/static/pages/electricity/list/list.html
src/main/resources/static/pages/forms/mould/lbStatuAnaly.xls
src/main/resources/static/pages/oil/checkJyryList.html
src/main/resources/static/pages/oil/list_ph.html
src/main/resources/static/pages/report/countMileage/countLine/company/countLineMileage.html
src/main/resources/static/pages/report/countMileage/countLine/countLineMileage.html
@@ -442,11 +442,24 @@ public class DlbServiceImpl extends BaseServiceImpl&lt;Dlb,Integer&gt; implements DlbS
 				if(lcMap.get(cl)==null){
 					lcMap.put(cl, lc);
 				}else{
-					Double lc_=lcMap.get(cl);
+					double lc_=lcMap.get(cl);
 					lcMap.remove(cl);
 					lcMap.put(cl, Arith.add(lc, lc_));
 				}
 			}
+			
+			Map<String, Double> shMap=new HashMap<String,Double>();
+			for (int i = 0; i < dlList.size(); i++) {
+				Dlb dlb=dlList.get(i);
+				String cl=dlb.getNbbm();
+				if(shMap.get(cl)==null){
+					shMap.put(cl, dlb.getSh());
+				}else{
+					double sh=shMap.get(cl);
+					shMap.remove(cl);
+					shMap.put(cl, Arith.add(sh, dlb.getSh()));
+				}
+			}
 			List<Jdl> jdlList=jdlRepository.JdlList(rq);
 			String sxtj=map2.get("sxtj").toString();
 			if(sxtj.equals("0")){
@@ -503,7 +516,7 @@ public class DlbServiceImpl extends BaseServiceImpl&lt;Dlb,Integer&gt; implements DlbS
 						//车辆总里程
 						double zlc =lcMap.get(map_.get("clZbh").toString());
 						//车辆总加电量
-						Double zjzl = 0.0;
+						double zjzl = 0.0;
 						for (int j = 0; j < ylxxList.size(); j++) {
 							Ylxxb ylxxb = ylxxList.get(j);
 							if (map_.get("clZbh").toString().equals(ylxxb.getNbbm())
@@ -519,7 +532,13 @@ public class DlbServiceImpl extends BaseServiceImpl&lt;Dlb,Integer&gt; implements DlbS
 								zjzl = Arith.add(zjzl,jdl.getJdl());
 							}
 						}
-						
+						double clsh=0.0;
+						if(shMap.get(map_.get("clZbh").toString())==null){
+							clsh=0.0;
+						}else{
+							clsh=shMap.get(map_.get("clZbh").toString());
+						}
+						zjzl =Arith.sub(zjzl, clsh);
 						Double nextJzyl = 0.0;
 						for (int i = 0; i < listpb.size(); i++) {
 							Map<String, Object> map = listpb.get(i);
@@ -630,6 +649,7 @@ public class DlbServiceImpl extends BaseServiceImpl&lt;Dlb,Integer&gt; implements DlbS
 									     updateList.add(t); 
 									  }
 								 }
+								 t.setCdl(Arith.add(t.getCdl(), t.getSh()));
 								newMap.put("status", ResponseCode.SUCCESS);
 							}
 						}
@@ -404,7 +404,7 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 							Ylxxb ylxxb = ylxxList.get(i);
 							if (map.get("clZbh").toString().equals(ylxxb.getNbbm())
 									&& map.get("jGh").toString().equals(ylxxb.getJsy())
-									&& ylxxb.getJylx()==1) {
+									&& ylxxb.getJylx()>0) {
 								if(ylxxb.getJzl()>0){
 									fage2=true;
 								}
@@ -418,7 +418,7 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 								Ylxxb ylxxb = ylxxList.get(j);
 								if (map.get("clZbh").toString().equals(ylxxb.getNbbm())
 										&& map.get("jGh").toString().equals(ylxxb.getJsy())
-										&& ylxxb.getJylx()==1) {
+										&& ylxxb.getJylx()>0) {
 									jzl =Arith.add(jzl, ylxxb.getJzl());
 								}
 							}
@@ -1165,7 +1165,7 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 			Integer id =jsonObject.getInteger("id");
 			String nbbm =jsonObject.getString("nbbm");
 			String rq=jsonObject.getString("rq");
-			double yh = Arith.sub(Arith.add(czyl, jzl), jzyl);
+			double yh = Arith.sub(Arith.add(czyl, jzl), Arith.add(jzyl, sh));
 			if(yh<0){
 				yh=0.0;
 			}
@@ -181,11 +181,15 @@ public class YlxxbServiceImpl extends BaseServiceImpl&lt;Ylxxb,Integer&gt; implements 
 				jsonObject=jsonArray.getJSONObject(x);
 				Integer id =jsonObject.getInteger("id");
 				String jsy =jsonObject.getString("jsy");
-				Ylxxb ylxxb=repository.findOne(id);
-				if(!ylxxb.getJsy().equals(jsy)){
-					ylxxb.setJsy(jsy);
-					ylxxb.setJylx(3);
-					repository.save(ylxxb);
+				String lsjsy =jsonObject.getString("lsjsy");
+				String ldgh =jsonObject.getString("ldgh");
+				if(!lsjsy.equals(jsy)){
+					if(ldgh.indexOf(jsy)>-1){
+						Ylxxb ylxxb=repository.findOne(id);
+						ylxxb.setJsy(jsy);
+						ylxxb.setJylx(3);
+						repository.save(ylxxb);
+					}
 				}
 			}
 			newMap.put("status", ResponseCode.SUCCESS);
@@ -945,34 +945,39 @@ public class CulateMileageServiceImpl  implements CulateMileageService{
 			ScheduleRealInfo t=lists.get(i);
 			if(!isInOut(t)){
 				if(!t.isSflj()){
-					Set<ChildTaskPlan> childTaskPlans = t.getcTasks();
-					if(childTaskPlans.isEmpty()){
-						if(!t.isDestroy()){
-							if( Math.abs(t.getJhlc()-t.getJhlcOrig())>0){
-								jhwlc =Arith.add(jhwlc, t.getJhlcOrig());
-							}else{
-								jhnlc =Arith.add(jhnlc, t.getJhlc());
+					if(t.isCcService()){
+						jhwlc =Arith.add(jhwlc, t.getJhlc());
+					}else{
+						Set<ChildTaskPlan> childTaskPlans = t.getcTasks();
+						if(childTaskPlans.isEmpty()){
+							if(!t.isDestroy()){
+								if( Math.abs(t.getJhlc()-t.getJhlcOrig())>0){
+									jhwlc =Arith.add(jhwlc, t.getJhlc());
+								}else{
+									jhnlc =Arith.add(jhnlc, t.getJhlc());
+								}
 							}
+						}else{
+							Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
+							double zrwlc=0.0;
+							boolean fage=false;
+			                while (it.hasNext()) {
+			                    ChildTaskPlan childTaskPlan = it.next();
+			                    if(childTaskPlan.getMileageType().equals("service")
+			                    		&& childTaskPlan.getCcId()==null){
+			                    	 if (childTaskPlan.isDestroy()) {
+			 	                    	fage=true;
+			 	                     }else{
+			 	                    	 zrwlc =Arith.add(zrwlc, childTaskPlan.getMileage());
+			 	                     }
+			                    }
+			                }
+			                if(fage){
+			                	jhwlc =Arith.add(jhwlc, zrwlc);
+			                }else{
+			                	jhnlc =Arith.add(jhnlc, zrwlc);
+			                }
 						}
-					}else{
-						Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
-						double zrwlc=0.0;
-						boolean fage=false;
-		                while (it.hasNext()) {
-		                    ChildTaskPlan childTaskPlan = it.next();
-		                    if(childTaskPlan.getMileageType().equals("service")){
-		                    	 if (childTaskPlan.isDestroy()) {
-		 	                    	fage=true;
-		 	                     }else{
-		 	                    	 zrwlc =Arith.add(zrwlc, childTaskPlan.getMileage());
-		 	                     }
-		                    }
-		                }
-		                if(fage){
-		                	jhwlc =Arith.add(jhwlc, zrwlc);
-		                }else{
-		                	jhnlc =Arith.add(jhnlc, zrwlc);
-		                }
 					}
 				}
 			}
@@ -994,35 +999,41 @@ public class CulateMileageServiceImpl  implements CulateMileageService{
 			ScheduleRealInfo t=lists.get(i);
 			if(t.getBcType().equals("in") || t.getBcType().equals("out")){
 				if(!t.isSflj()){
-					Set<ChildTaskPlan> childTaskPlans = t.getcTasks();
-					if(childTaskPlans.isEmpty()){
-						if(!t.isDestroy()){
-							if( Math.abs(t.getJhlc()-t.getJhlcOrig())>0){
-								jhwlc =Arith.add(jhwlc, t.getJhlcOrig());
-							}else{
-								jhnlc =Arith.add(jhnlc, t.getJhlc());
-							}
-						}
+					if(t.isCcService()){
+						jhwlc =Arith.add(jhwlc, t.getJhlc());
 					}else{
-						Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
-						double zrwlc=0.0;
-						boolean fage=false;
-		                while (it.hasNext()) {
-		                    ChildTaskPlan childTaskPlan = it.next();
-		                    if(childTaskPlan.getMileageType().equals("empty")){
-		                    	 if (childTaskPlan.isDestroy()) {
-		 	                    	fage=true;
-		 	                     }else{
-		 	                    	 zrwlc =Arith.add(zrwlc, childTaskPlan.getMileage());
-		 	                     }
-		                    }
-		                }
-		                if(fage){
-		                	jhwlc =Arith.add(jhwlc, zrwlc);
-		                }else{
-		                	jhnlc =Arith.add(jhnlc, zrwlc);
-		                }
-				    }
+						Set<ChildTaskPlan> childTaskPlans = t.getcTasks();
+						if(childTaskPlans.isEmpty()){
+							if(!t.isDestroy()){
+								if( Math.abs(t.getJhlc()-t.getJhlcOrig())>0){
+									jhwlc =Arith.add(jhwlc, t.getJhlc());
+								}else{
+									jhnlc =Arith.add(jhnlc, t.getJhlc());
+								}
+							}
+						}else{
+							Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
+							double zrwlc=0.0;
+							boolean fage=false;
+			                while (it.hasNext()) {
+			                    ChildTaskPlan childTaskPlan = it.next();
+			                    if(childTaskPlan.getMileageType().equals("empty")
+			                    		&& childTaskPlan.getCcId()==null){
+			                    	 if (childTaskPlan.isDestroy()) {
+			 	                    	fage=true;
+			 	                     }else{
+			 	                    	 zrwlc =Arith.add(zrwlc, childTaskPlan.getMileage());
+			 	                     }
+			                    }
+			                }
+			                if(fage){
+			                	jhwlc =Arith.add(jhwlc, zrwlc);
+			                }else{
+			                	jhnlc =Arith.add(jhnlc, zrwlc);
+			                }
+					    }
+					}
+					
 			    }
 			}
 		}
@@ -1049,15 +1060,6 @@ public class CulateMileageServiceImpl  implements CulateMileageService{
 						}
 					}
-					/*else{
-						//临加进出场子任务 待统计
-						Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
-						double zrwlc=0.0;
-						boolean fage=false;
-		                while (it.hasNext()) {
-		                    ChildTaskPlan childTaskPlan = it.next();
-		                }
-					}*/
 				}
 				if(t.getBcType().equals("ldks")){
@@ -1068,15 +1070,6 @@ public class CulateMileageServiceImpl  implements CulateMileageService{
 						}
 					}
-					/*else{
-						//临加进出场子任务 待统计
-						Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
-						double zrwlc=0.0;
-						boolean fage=false;
-		                while (it.hasNext()) {
-		                    ChildTaskPlan childTaskPlan = it.next();
-		                }
-					}*/
 				}
 				if(!isInOut(t)){
 					Set<ChildTaskPlan> childTaskPlans = t.getcTasks();
@@ -1096,9 +1089,6 @@ public class CulateMileageServiceImpl  implements CulateMileageService{
 		                    		 if(childTaskPlan.getType2().equals("2")||childTaskPlan.getType2().equals("3")){
 		                    			 ljjcc =Arith.add(ljjcc, childTaskPlan.getMileage());
 		                    		 }
-		                    		 if(childTaskPlan.getType2().equals("1")){
-		                    			 ljkfks =Arith.add(ljkfks, childTaskPlan.getMileage());
-		                    		 }
 		                    	 }
 		                    }
 		                }
@@ -1116,29 +1106,39 @@ public class CulateMileageServiceImpl  implements CulateMileageService{
 	@Override
 	public double culateSsMile(List<ScheduleRealInfo> lists) {
-		double zlblc =0.0;
-		for (int i = 0; i < lists.size(); i++) {
-			ScheduleRealInfo scheduleRealInfo=lists.get(i);
-			if (!isInOut(scheduleRealInfo)) {
-				Set<ChildTaskPlan> childTaskPlans = scheduleRealInfo.getcTasks();
-				if(childTaskPlans.isEmpty()){
-					if(scheduleRealInfo.isDestroy()){
-						zlblc=Arith.add(zlblc,scheduleRealInfo.getJhlcOrig()==null?0:scheduleRealInfo.getJhlcOrig());
+		// TODO Auto-generated method stub
+				double zlblc =0.0;
+				for (int i = 0; i < lists.size(); i++) {
+					ScheduleRealInfo scheduleRealInfo=lists.get(i);
+					if (!isInOut(scheduleRealInfo)) {
+						Set<ChildTaskPlan> childTaskPlans = scheduleRealInfo.getcTasks();
+						if(childTaskPlans.isEmpty()){
+							if(scheduleRealInfo.isDestroy()){
+								zlblc=Arith.add(zlblc,scheduleRealInfo.getJhlcOrig()==null?0:scheduleRealInfo.getJhlcOrig());
+							}else{
+								double jhlc=scheduleRealInfo.getJhlc()==null?0:scheduleRealInfo.getJhlc();
+								double jhlcOrig=scheduleRealInfo.getJhlcOrig()==null?0:scheduleRealInfo.getJhlcOrig();
+								double cjlc=Arith.sub(jhlcOrig,jhlc);
+								if(cjlc>0){
+									zlblc=Arith.add(zlblc, cjlc);
+								}
+							}
+						}else{
+							Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
+			                while (it.hasNext()) {
+			                    ChildTaskPlan childTaskPlan = it.next();
+			                    if(childTaskPlan.getCcId()==null){
+				                    if(childTaskPlan.getMileageType().equals("service")){
+					                    if (childTaskPlan.isDestroy()) {
+					    					zlblc=Arith.add(zlblc,childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage());
+					                    } 
+				                    }
+			                    }
+			                }
+						}
 					}
-				}else{
-					Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
-	                while (it.hasNext()) {
-	                    ChildTaskPlan childTaskPlan = it.next();
-	                    if(childTaskPlan.getMileageType().equals("service")){
-		                    if (childTaskPlan.isDestroy()) {
-		    					zlblc=Arith.add(zlblc,childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage());
-		                    } 
-	                    }
-	                }
 				}
-			}
-		}
-		return zlblc;
+				return zlblc;
 	}
 	@Override
@@ -1153,28 +1153,34 @@ public class CulateMileageServiceImpl  implements CulateMileageService{
             //有子任务
             if (cts != null && cts.size() > 0) {
                 for(ChildTaskPlan c : cts){
-                	if(item.equals("其他")){
-                		if(c.isDestroy() && 
-                				((c.getDestroyReason()==null?"": c.getDestroyReason()).equals(item)||
-                						(c.getDestroyReason()==null?"": c.getDestroyReason()).equals("")))
-                            sum = Arith.add(sum, c.getMileage());
-                	}else{
-                		if(c.isDestroy() && (c.getDestroyReason()==null?"": c.getDestroyReason()).equals(item))
-                            sum = Arith.add(sum, c.getMileage());
+                	if(c.getCcId()==null){
+	                	if(item.equals("其他")){
+	                		if(c.isDestroy() && 
+	                				((c.getDestroyReason()==null?"": c.getDestroyReason()).equals(item)||
+	                						(c.getDestroyReason()==null?"": c.getDestroyReason()).equals("")))
+	                            sum = Arith.add(sum, c.getMileage());
+	                	}else{
+	                		if(c.isDestroy() && (c.getDestroyReason()==null?"": c.getDestroyReason()).equals(item))
+	                            sum = Arith.add(sum, c.getMileage());
+	                	}
                 	}
-                    
                 }
             }
             else if(isInOut(sch))
                 continue;
             //主任务烂班
-            else if(sch.getStatus() == -1){
+            else if(sch.getStatus() == -1 && !sch.isCcService()){
                 if(sch.getAdjustExps().equals(item) ||
                         (StringUtils.isEmpty(sch.getAdjustExps()) && item.equals("其他"))){
                     sum = Arith.add(sum, sch.getJhlcOrig());
                 }
             }
-           
+            else if(item.equals("其他")){
+                double diff =  Arith.sub(sch.getJhlcOrig(), sch.getJhlc());
+                if(diff > 0){
+                    sum = Arith.add(sum, diff);
+                }
+            }
         }
         return sum;
 	}
@@ -1223,20 +1229,22 @@ public class CulateMileageServiceImpl  implements CulateMileageService{
 		double kfks=0.0;
 		for (int i = 0; i < lists.size(); i++) {
 			ScheduleRealInfo t=lists.get(i);
-			if(t.getBcType().equals("ldks")){
-				Set<ChildTaskPlan> childTaskPlans = t.getcTasks();
-				if(childTaskPlans.isEmpty()){
-					if(!t.isDestroy()){
-						kfks=Arith.add(kfks,t.getJhlcOrig()==null?0:t.getJhlcOrig());
+			if(!t.isSflj()){
+				if(t.getBcType().equals("ldks")){
+					Set<ChildTaskPlan> childTaskPlans = t.getcTasks();
+					if(childTaskPlans.isEmpty()){
+						if(!t.isDestroy()){
+							kfks=Arith.add(kfks,t.getJhlcOrig()==null?0:t.getJhlcOrig());
+						}
+					}else{
+						Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
+		                while (it.hasNext()) {
+		                    ChildTaskPlan childTaskPlan = it.next();
+		                    if (!childTaskPlan.isDestroy()) {
+		                    	kfks=Arith.add(kfks,childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage());
+		                    } 
+		                }
 					}
-				}else{
-					Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
-	                while (it.hasNext()) {
-	                    ChildTaskPlan childTaskPlan = it.next();
-	                    if (!childTaskPlan.isDestroy()) {
-	                    	kfks=Arith.add(kfks,childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage());
-	                    } 
-	                }
 				}
 			}
 		}
@@ -1715,7 +1715,7 @@ public class ReportServiceImpl implements ReportService{
 						newMap.put("nr", adjustExps);
 						newMap.put("lp", scheduleRealInfo.getLpName());
 						newMap.put("nbbm", scheduleRealInfo.getClZbh());
-						newMap.put("jgh", scheduleRealInfo.getjGh());
+						newMap.put("jgh", scheduleRealInfo.getjGh()+scheduleRealInfo.getjName()+"/"+scheduleRealInfo.getsGh()+scheduleRealInfo.getsName());
 						newMap.put("dz", scheduleRealInfo.getQdzName());
 						newMap.put("sj", scheduleRealInfo.getFcsj());
 						newMap.put("lbbc", 1);
@@ -1747,12 +1747,12 @@ public class ReportServiceImpl implements ReportService{
 						newMap.put("nr", adjustExps);
 						newMap.put("lp", scheduleRealInfo.getLpName());
 						newMap.put("nbbm", scheduleRealInfo.getClZbh());
-						newMap.put("jgh", scheduleRealInfo.getjGh());
+						newMap.put("jgh", scheduleRealInfo.getjGh()+scheduleRealInfo.getjName()+"/"+scheduleRealInfo.getsGh()+scheduleRealInfo.getsName());
 						newMap.put("dz", scheduleRealInfo.getQdzName());
 						newMap.put("sj", scheduleRealInfo.getFcsj());
 						newMap.put("lbbc", 1);
 						newMap.put("lblc", zlblc);
-						newMap.put("jyqp", scheduleRealInfo.getRealMileage());
+						newMap.put("jyqp", scheduleRealInfo.getRemarks());
 						list.add(newMap);
 					} else {
 						while (it.hasNext()) {
@@ -1770,7 +1770,7 @@ public class ReportServiceImpl implements ReportService{
 								newMap.put("nr", destroyReason);
 								newMap.put("lp", scheduleRealInfo.getLpName());
 								newMap.put("nbbm", scheduleRealInfo.getClZbh());
-								newMap.put("jgh", scheduleRealInfo.getjGh());
+								newMap.put("jgh", scheduleRealInfo.getjGh()+scheduleRealInfo.getjName()+"/"+scheduleRealInfo.getsGh()+scheduleRealInfo.getsName());
 								newMap.put("dz", childTaskPlan.getStartStationName());
 								newMap.put("sj", childTaskPlan.getStartDate());
 								newMap.put("gzf", " ");
@@ -2620,6 +2620,16 @@ public class ReportServiceImpl implements ReportService{
 			double zlc=Arith.add(Arith.add(Arith.add(zrwjcc, ljlc),
 					Arith.add(zjcclc, zyylc)),kfks);
 			map.put("zlc", zlc);
+			
+			//备用
+			double ljgl= culateService.culateLjgl(lists);
+	        double sjyygl= culateService.culateSjgl(lists);
+	        double zyygl= Arith.add(sjyygl,ljgl);
+	
+	        double sjjccgl=culateService.culateJccgl(lists);
+	        double sjksgl=culateService.culateKsgl(lists);
+	        double zksgl=Arith.add(sjjccgl, sjksgl);
+	        map.put("sjzgl", Arith.add(zyygl, zksgl));
 		}
 		return map;
 	}
@@ -212,7 +212,7 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep
 	<lable style="float:left">%<lable>
         </td>
         <td>
-<input data-id="{{obj.id}}" href="javascript:;" class="in_carpark_hd" 
+<input data-id="{{obj.id}}" href="javascript:;" class="in_carpark_hd" readOnly="true" 
             type="text" value=" {{obj.hd}}" style=" width:45px;float:left"  
 onkeyup="this.value=this.value.replace(/[^(\d||/.)]/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.')"  
             onafterpaste="this.value=this.value.replace(/[^(\d||/.)]/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.')" />
@@ -393,29 +393,6 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep
             	 }
-               /*  var id = $('input.icheck:checked').data('id');
-               
-                if (typeof(id) == 'undefined') {
-                    layer.msg("请选择一行进行拆分");
-                } else {
-                    //获取输入的进场存油
-                    var jzyl =  $('.in_carpark_jzcd[data-id='+id+']', '#dl_oil_list').html();
-                    var sh =  $('.in_carpark_shyl[data-id='+id+']', '#dl_oil_list').html();
-                    var shyy =  $('.in_carpark_shyy[data-id='+id+']', '#dl_oil_list').val();
-                   // $("#jzyl" + id).html();
-                    var params = {};
-                    params['jzyl'] = jzyl;
-                    params['sh'] =sh;
-                    params['shyy']=shyy;
-                    params['id'] = id;
-                     var i = layer.load(2);
-                    $get('/ylb/sort', params, function () {
-                    	layer.close(i);
-                    	var params1 =getParamsList();
-                        jsDoQuery(params1, true);
-                    }); 
-
-                } */
             } else {
                 layer.msg('请选择日期.');
             }
@@ -512,18 +489,6 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep
 	    		updateCompany();
 	    	});
 		})
-    	/* function setFgsqx(gs){
-    		var company =gs
-    		var options = '';
-    		for(var i = 0; i < obj.length; i++){
-    			if(obj[i].companyCode == company){
-    				var children = obj[i].children;
-    				for(var j = 0; j < children.length; j++){
-    					gsqxdm +=company+""+children[j].code+",";
-    				}
-    			}
-    		}
-    	} */
     	$("#ylbListGsdmId").on("change",updateCompany);
     	function updateCompany(){
     		var company = $('#ylbListGsdmId').val();
@@ -553,24 +518,6 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep
             params['page'] = page;
             params['rq'] = $("#rq").val();
-          /*   var ylbGsdm=$("#ylbListGsdmId").val();
-    		var ylbFgsdm=$("#ylbListFgsdmId").val();
-    		if(ylbGsdm==''|| ylbGsdm==null){
-    			params['concat(ssgsdm,fgsdm)_in']=gsqxdm;
-    		}else{
-    			if(ylbFgsdm==''||ylbFgsdm==null){
-    				var fgsqx1='';
-    				for(var i = 0; i < obj.length; i++){
-    					if(obj[i].companyCode == ylbGsdm){
-    						var children = obj[i].children;
-    						for(var j = 0; j < children.length; j++){
-    							fgsqx1 +=children[j].code+",";
-    						}
-    					}
-    				}
-    				params['fgsdm_in']=fgsqx1;
-    			}
-    		} */
             var l = layer.load(2);
             $get('/dlb/dlbList', params, function (data) {
@@ -580,24 +527,80 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep
                 });
                 var bodyHtm = template('dlb_list_temp', {list:data});
                 $('#datatable_dlb tbody').html(bodyHtm);
-               /*  $('#datatable_dlb tbody').html(bodyHtm)
-                        .find('.icheck').iCheck(icheckOptions)
-                        .on('ifChanged', iCheckChange);
-                if (pagination && data.content.length > 0) {
-                    //重新分页
-                    initPagination = true;
-                    showPagination(data);
-                } */
                 layer.close(l);
             	$get('/dlb/sumYlb',params,function(returns){
             		$("#sumJzl").html(returns.jzl);
             		$("#sumYh").html(returns.yh);
             		$("#sumSh").html(returns.sh);
         		});
-//                 startOptJzylLink($('#dl_oil_list .in_carpark_jzcd'));
-//                 startOptShylLink($('#dl_oil_list .in_carpark_shyl'));
+            	
+            	 $('input').on('input propertychange',function(){
+                  	var id=$(this).data('id');
+                  	var cdl =$('.in_carpark_cdl[data-id='+id+']', '#dl_oil_list').html();
+             		if(cdl=="" || cdl ==null){
+             			cdl=0;
+             		}
+             		var sh =  $('.in_carpark_shyl[data-id='+id+']', '#dl_oil_list').val();
+             		if(sh=="" || sh==null){
+             			sh=0;
+             		}
+             		
+             		var sub=numSubtr(cdl*1000,sh*1000);
+             		var subValue=0;
+             		if(sub/1000>=0){
+             			subValue=sub/1000;
+             		}
+             		$('.in_carpark_hd[data-id='+id+']', '#dl_oil_list').val(subValue);
+             		
+                  });
             });
         }
+        
+      //页面计算防止精度丢失
+		var accAdd = function (a, b) {
+	        var c, d, e;
+	        try {
+	            c = a.toString().split(".")[1].length;
+	        } catch (f) {
+	            c = 0;
+	        }
+	        try {
+	            d = b.toString().split(".")[1].length;
+	        } catch (f) {
+	            d = 0;
+	        }
+	        return e = Math.pow(10, Math.max(c, d)), (mul(a, e) + mul(b, e)) / e;
+	    };
+
+	    var numSubtr = function (a, b) {
+	        var c, d, e;
+	        try {
+	            c = a.toString().split(".")[1].length;
+	        } catch (f) {
+	            c = 0;
+	        }
+	        try {
+	            d = b.toString().split(".")[1].length;
+	        } catch (f) {
+	            d = 0;
+	        }
+	        return e = Math.pow(10, Math.max(c, d)), (a * e - b * e) / e;
+	    };
+	    
+	    function mul(a, b) {
+	        var c = 0,
+	            d = a.toString(),
+	            e = b.toString();
+	        try {
+	            c += d.split(".")[1].length;
+	        } catch (f) {
+	        }
+	        try {
+	            c += e.split(".")[1].length;
+	        } catch (f) {
+	        }
+	        return Number(d.replace(".", "")) * Number(e.replace(".", "")) / Math.pow(10, c);
+	    }
         //改变状态
         function startOptJzylLink(es) {
@@ -735,13 +738,6 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep
 			initPinYinSelect2('#xlbm',data,'');
 			fage=true;
 		}
-// 		$("#ylbListGsdmId").on("change",initNbbm);
-//        	$("#ylbListFgsdmId").on("change",initNbbm);
-//        	$("#xlbm").on("change",initNbbm);
-// 		function initNbbm(){
-//        		var gsbm=$('#ylbListGsdmId').val(),
-//         	var fgsbm=$('#ylbListFgsdmId').val(),
-//         	var xlbm=$('#xlbm').val();
         	$("#xlbm").on("change",initCl);
         	function initCl(){
         	$('#nbbm').select2({
@@ -130,6 +130,7 @@
 		<select  class="form-control in_carpark_jsy"  name="jsy" id="jsy{{obj.id}}" data-id="{{obj.id}}"> 
 			<option selected="selected" value="{{obj.jsy}}">{{obj.jsy}}<option>
 		</select>
+		<lable data-id="{{obj.id}}" style="display: none"  class="in_carpark_ls_jsy">{{obj.jsy}}</lable>
 	</td>
 	<td>
 		{{obj.jzl}}
@@ -138,7 +139,9 @@
 	<td>{{obj.nylx}}</td>
 	<td>{{obj.jyggh}}</td>
 	<td></td>
-	<td>{{obj.ldgh}}</td>
+	<td>
+		<lable data-id="{{obj.id}}"  class="in_carpark_ldgh">{{obj.ldgh}}</lable>
+	</td>
 	<td>
 		{{obj.bz}}
 	</td>
@@ -162,8 +165,13 @@ $(function(){
     		var map = {};
     		var id=$(this).data('id');
     		var jsy=$('.in_carpark_jsy[data-id='+id+']', '#ll_jyry_list').val();
+    		var lsjsy=$('.in_carpark_ls_jsy[data-id='+id+']', '#ll_jyry_list').html();
+    		var ldgh=$('.in_carpark_ldgh[data-id='+id+']', '#ll_jyry_list').html(); 
+    		
     		map['id']=id;
             map['jsy']=jsy;
+            map['lsjsy']=lsjsy;
+            map['ldgh']=ldgh;
             ylArray.push(map);
     	})
     	var params = {};
@@ -859,6 +859,7 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep
         	})
 	     	var params = {};
 	     	params['ids']=JSON.stringify(idArray);
+	     	console.log(idArray);
 	       	 if (x==0) {
 	       		 layer.msg("请选择要删除的数据");
 	       	 }else{
@@ -970,9 +971,11 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep
         //全选 全不选
         $("#selectAll").on("click", function () {
  			if ($(this).is(":checked")) {
-                    $("[name=id]:checkbox").prop("checked", true);
+//                     $("[name=id]:checkbox").prop("checked", true);
+                    $("input[name='id']").attr('checked', true)
                 } else {
-                    $("[name=id]:checkbox").prop("checked", false);
+//                     $("[name=id]:checkbox").prop("checked", false);
+                    $("input[name='id']").attr('checked', false);
                 }
 		});
@@ -112,7 +112,7 @@
 							</tr>
 						</thead>
-						<tbody class="countLine">
+						<tbody class="countLineNb">
 						</tbody>
 					</table>
@@ -270,7 +270,7 @@
 					// 把数据填充到模版中
 					var tbodyHtml = template('countLineList',{list:result});
 					// 把渲染好的模版html文本追加到表格中
-					$('#forms .countLine').html(tbodyHtml);
+					$('#forms .countLineNb').html(tbodyHtml);
 					if(result.length == 0)
 						$("#export").attr('disabled',"true");
@@ -111,7 +111,7 @@
 							</tr>
 						</thead>
-						<tbody class="countLine">
+						<tbody class="countLineSj">
 						</tbody>
 					</table>
@@ -269,7 +269,7 @@
 					// 把数据填充到模版中
 					var tbodyHtml = template('countLineList',{list:result});
 					// 把渲染好的模版html文本追加到表格中
-					$('#forms .countLine').html(tbodyHtml);
+					$('#forms .countLineSj').html(tbodyHtml);
 					if(result.length == 0)
 						$("#export").attr('disabled',"true");