报表中计算实际里程班次去掉没有实到实发的班次信息

廖磊
1 parent 5906cdb4
Showing 4 changed files with 110 additions and 39 deletions
src/main/java/com/bsth/service/forms/impl/FormsServiceImpl.java
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/report/impl/ReportServiceImpl.java
@@ -114,8 +114,15 @@ public class FormsServiceImpl implements FormsService {
 			List<ScheduleRealInfo> listInfo=new ArrayList<ScheduleRealInfo>();
 			for (int j = 0; j < realList.size(); j++) {
 				ScheduleRealInfo s=realList.get(j);
-				if(w.getNbbm().equals(s.getClZbh()) && w.getJgh().equals(w.getJgh())){
-					listInfo.add(s);
+				if(w.getNbbm().equals(s.getClZbh()) && w.getJgh().equals(s.getjGh())){
+					 Set<ChildTaskPlan> cts = s.getcTasks();
+			            if(cts != null && cts.size() > 0){
+							listInfo.add(s);
+			            }else{
+				            if(s.getZdsjActual()!=null && s.getFcsjActual()!=null){
+								listInfo.add(s);
+				            }
+			            }
 				}
 			}
@@ -290,9 +297,11 @@ public class FormsServiceImpl implements FormsService {
 		});
 		List<ScheduleRealInfo> sList;
+		List<ScheduleRealInfo> list_s;
 		List<ScheduleRealInfo> lists=scheduleRealInfoRepository.scheduleByDateAndLineYbb(map.get("line").toString(), map.get("startDate").toString(), map.get("endDate").toString());
 		for(int i=0;i<list.size();i++){
 			sList =new ArrayList<ScheduleRealInfo>();
+			list_s =new ArrayList<ScheduleRealInfo>();
 			Shiftuehiclemanth d=list.get(i);
 			for (int j = 0; j < lists.size(); j++) {
 				ScheduleRealInfo s=lists.get(j);
@@ -302,31 +311,56 @@ public class FormsServiceImpl implements FormsService {
 				if(empnames.equals("驾驶员")){
 					if(d.getJgh().equals(s.getjGh())){
 						sList.add(s);
+						Set<ChildTaskPlan> cts = s.getcTasks();
+			            if(cts != null && cts.size() > 0){
+			            	 list_s.add(s);
+			            }else{
+				            if(s.getZdsjActual()!=null && s.getFcsjActual()!=null){
+				                list_s.add(s);
+				            }
+			            }
+						
 					}
 				}else if(empnames.equals("售票员")){
 					String sgh=s.getsGh()==null?"":s.getsGh();
 					if(d.getSgh().equals(sgh)){
 						sList.add(s);
+						Set<ChildTaskPlan> cts = s.getcTasks();
+			            if(cts != null && cts.size() > 0){
+			            	 list_s.add(s);
+			            }else{
+				            if(s.getZdsjActual()!=null && s.getFcsjActual()!=null){
+				                list_s.add(s);
+				            }
+			            }
 					}
 				}else if(empnames.equals("车辆自编号")){
 					if(d.getjName().equals(s.getClZbh())){
 						sList.add(s);
+						Set<ChildTaskPlan> cts = s.getcTasks();
+			            if(cts != null && cts.size() > 0){
+			            	 list_s.add(s);
+			            }else{
+				            if(s.getZdsjActual()!=null && s.getFcsjActual()!=null){
+				                list_s.add(s);
+				            }
+			            }
 					}
 				}
 			}
-			double ksgl=culateMileageService.culateKsgl(sList);
-			double jccgl=culateMileageService.culateJccgl(sList);
+			double ksgl=culateMileageService.culateKsgl(list_s);
+			double jccgl=culateMileageService.culateJccgl(list_s);
 			double zksgl=Arith.add(ksgl, jccgl);
-			double ljgl=culateMileageService.culateLjgl(sList);
-			double sjgl=culateMileageService.culateSjgl(sList);
+			double ljgl=culateMileageService.culateLjgl(list_s);
+			double sjgl=culateMileageService.culateSjgl(list_s);
 			double zyygl=Arith.add(ljgl, sjgl);
 			int cjbc=culateMileageService.culateLbbc(sList);
-			int ljbc=culateMileageService.culateLjbc(sList,"");
-			int sjbc=culateMileageService.culateSjbc(sList, "");
+			int ljbc=culateMileageService.culateLjbc(list_s,"");
+			int sjbc=culateMileageService.culateSjbc(list_s, "");
 			double cjgl=culateMileageService.culateLbgl(sList);
-			double zjgl=culateMileageService.culateLjgl(sList);
+			double zjgl=culateMileageService.culateLjgl(list_s);
 			d.setEmptMileage(String.valueOf(zksgl));//空驶公里
 			d.setTotalm(String.valueOf(Arith.add(zksgl, zyygl)));//总公里
 			d.setSjbc(String.valueOf(sjbc+ljbc));
@@ -418,30 +452,40 @@ public class FormsServiceImpl implements FormsService {
 		});
 		List<ScheduleRealInfo> sList;
+		List<ScheduleRealInfo> list_s;
 		List<ScheduleRealInfo> lists=scheduleRealInfoRepository.scheduleByDateAndLineTjrb(map.get("line").toString(), map.get("date").toString());
 		for(int i=0;i<list.size();i++){
 			sList =new ArrayList<ScheduleRealInfo>();
+			list_s =new ArrayList<ScheduleRealInfo>();
 			Shifday d=list.get(i);
 			for (int j = 0; j < lists.size(); j++) {
 				ScheduleRealInfo s=lists.get(j);
 				if(d.getJgh().equals(s.getjGh()) && d.getCarPlate().equals(s.getClZbh())){
 					sList.add(s);
+					 Set<ChildTaskPlan> cts = s.getcTasks();
+			            if(cts != null && cts.size() > 0){
+			            	 list_s.add(s);
+			            }else{
+				            if(s.getZdsjActual()!=null && s.getFcsjActual()!=null){
+				                list_s.add(s);
+				            }
+			            }
 				}
 			}
-			double ksgl=culateMileageService.culateKsgl(sList);
-			double jccgl=culateMileageService.culateJccgl(sList);
+			double ksgl=culateMileageService.culateKsgl(list_s);
+			double jccgl=culateMileageService.culateJccgl(list_s);
 			double zksgl=Arith.add(ksgl, jccgl);
-			double ljgl=culateMileageService.culateLjgl(sList);
-			double sjgl=culateMileageService.culateSjgl(sList);
+			double ljgl=culateMileageService.culateLjgl(list_s);
+			double sjgl=culateMileageService.culateSjgl(list_s);
 			double zyygl=Arith.add(ljgl, sjgl);
 			double jhgl=culateMileageService.culateJhgl(sList);
 			double cjgl=culateMileageService.culateLbgl(sList);
-			int jhbc	=culateMileageService.culateJhbc(sList,"");
+			int jhbc=culateMileageService.culateJhbc(sList,"");
 			int cjbc=culateMileageService.culateLbbc(sList);
-			int ljbc=culateMileageService.culateLjbc(sList,"");
-			int sjbc=culateMileageService.culateSjbc(sList, "");
-			double zjgl=culateMileageService.culateLjgl(sList);
+			int ljbc=culateMileageService.culateLjbc(list_s,"");
+			int sjbc=culateMileageService.culateSjbc(list_s, "");
+			double zjgl=culateMileageService.culateLjgl(list_s);
 			d.setEmptMileage(String.valueOf(zksgl));//空驶公里
 			d.setTotalm(String.valueOf(Arith.add(zksgl, zyygl)));//总公里
 			d.setSjbc(String.valueOf(sjbc+ljbc));
@@ -1610,10 +1654,19 @@ public class FormsServiceImpl implements FormsService {
 			for (int j = 0; j < lists.size(); j++) {
 				ScheduleRealInfo s=lists.get(j);
 				if(d.getJgh().equals(s.getjGh()) && d.getZbh().equals(s.getClZbh())){
-					sList.add(s);
+					 Set<ChildTaskPlan> cts = s.getcTasks();
+			            if(cts != null && cts.size() > 0){
+			            	sList.add(s);
+			            }else{
+				            if(s.getZdsjActual()!=null && s.getFcsjActual()!=null){
+				            	sList.add(s);
+				            }
+			            }
+					
 				}
 			}
+			
 			double ksgl=culateMileageService.culateKsgl(sList);
 			double jccgl=culateMileageService.culateJccgl(sList);
 			double zksgl=Arith.add(ksgl, jccgl);
@@ -797,7 +797,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         		+ " min(s.fcsj) as fcsj,2 as px from bsth_c_s_sp_info_real s  "
         		+ " where s.xl_Bm = '"+line+"' and s.schedule_date_str ='"+date+"'"
         		+ " GROUP BY s.j_Gh,s.cl_Zbh,s.lp_Name ,s.j_Name "
-        		+ " ) y where y.fcsj <='"+minfcsj+"') z order by (" + state + "),dateStr,px " + type;
+        		+ " ) y where y.fcsj <='"+minfcsj+"') z order by (" + state + "),dateStr,px,fcsj " + type;
         List<ScheduleRealInfo> list = jdbcTemplate.query(sqlPlan,
                 new RowMapper<ScheduleRealInfo>() {
                     @Override
@@ -2616,11 +2616,18 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         map.put("dtbc", 0);
         map.put("dtbc_m", 0);
         map.put("dtbc_a", 0);
-        Map<String, Object> m_=culateService.culateDjg(list_s, list.get(0).getXlBm());
-        map.put("djg", m_.get("djgcsq"));
-        map.put("djg_m", m_.get("djgcsz"));
-        map.put("djg_a", m_.get("djgcsw"));
-        map.put("djg_time", m_.get("djgsj"));
+        if(list.size()>0){
+	        Map<String, Object> m_=culateService.culateDjg(list_s, list.get(0).getXlBm());
+	        map.put("djg", m_.get("djgcsq"));
+	        map.put("djg_m", m_.get("djgcsz"));
+	        map.put("djg_a", m_.get("djgcsw"));
+	        map.put("djg_time", m_.get("djgsj"));
+        }else{
+        	 map.put("djg", "0");
+             map.put("djg_m", "0");
+             map.put("djg_a", "0");
+             map.put("djg_time", "0");
+        }
         lMap.add(map);
         if (type != null && type.length() != 0 && type.equals("export")) {
             SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"),
@@ -1383,7 +1383,7 @@ public class CulateMileageServiceImpl  implements CulateMileageService{
 						djgcsz ++;
 						djgcsq ++;
 						if(fscjNext-fcsjTime>djcsj){
-							djcsj=(fscjNext-fcsjTime)/1000;
+							djcsj=(fscjNext-fcsjTime)/60000;
 						}
 					}
 				}else if((fcsj>=wgf1&&fcsj<=wgf2)){
@@ -1392,7 +1392,7 @@ public class CulateMileageServiceImpl  implements CulateMileageService{
 						djgcsw ++;
 						djgcsq ++;
 						if(fscjNext-fcsjTime>djcsj){
-							djcsj=(fscjNext-fcsjTime)/1000;
+							djcsj=(fscjNext-fcsjTime)/60000;
 						}
 					}
 				}else{
@@ -1400,7 +1400,7 @@ public class CulateMileageServiceImpl  implements CulateMileageService{
 					if(fscjNext-fcsjTime>djg){
 						djgcsq ++;
 						if(fscjNext-fcsjTime>djcsj){
-							djcsj=(fscjNext-fcsjTime)/1000;
+							djcsj=(fscjNext-fcsjTime)/60000;
 						}
 					}
 				}
@@ -1421,7 +1421,7 @@ public class CulateMileageServiceImpl  implements CulateMileageService{
 						djgcsz ++;
 						djgcsq ++;
 						if(fscjNext-fcsjTime>djcsj){
-							djcsj=(fscjNext-fcsjTime)/1000;
+							djcsj=(fscjNext-fcsjTime)/60000;
 						}
 					}
 				}else if(fcsj>=wgf1&&fcsj<=wgf2){
@@ -1430,7 +1430,7 @@ public class CulateMileageServiceImpl  implements CulateMileageService{
 						djgcsw ++;
 						djgcsq ++;
 						if(fscjNext-fcsjTime>djcsj){
-							djcsj=(fscjNext-fcsjTime)/1000;
+							djcsj=(fscjNext-fcsjTime)/60000;
 						}
 					}
 				}else{
@@ -1438,7 +1438,7 @@ public class CulateMileageServiceImpl  implements CulateMileageService{
 					if(fscjNext-fcsjTime>djg){
 						djgcsq ++;
 						if(fscjNext-fcsjTime>djcsj){
-							djcsj=(fscjNext-fcsjTime)/1000;
+							djcsj=(fscjNext-fcsjTime)/60000;
 						}
 					}
 				}
@@ -3089,15 +3089,26 @@ public class ReportServiceImpl implements ReportService{
 				ScheduleRealInfo sinfo=list.get(j);
 				try {
 					if(sinfo.getXlBm().equals(lineCode)){
-						list_.add(sinfo);
-						ScheduleRealInfo s=checkBc(sinfo);
-						String fcsj=s.getFcsjActual()==null?"":s.getFcsjActual();
-						if(!fcsj.equals("")){
-							Long fcsjAcual = sdf.parse(s.getRealExecDate() + " " + s.getFcsjActual()).getTime();
-							s.setFcsjActualTime(fcsjAcual);
-							s.setFcsjActual(fcsj);
-							listInfo.add(s);
-						}
+						boolean type_=false;
+						Set<ChildTaskPlan> cts = sinfo.getcTasks();
+			            if(cts != null && cts.size() > 0){
+			            	type_=true;
+			            }else{
+				            if(sinfo.getZdsjActual()!=null && sinfo.getFcsjActual()!=null){
+				            	type_=true;
+				            }
+			            }
+			            if(type_){
+			            	list_.add(sinfo);
+							ScheduleRealInfo s=checkBc(sinfo);
+							String fcsj=s.getFcsjActual()==null?"":s.getFcsjActual();
+							if(!fcsj.equals("")){
+								Long fcsjAcual = sdf.parse(s.getRealExecDate() + " " + s.getFcsjActual()).getTime();
+								s.setFcsjActualTime(fcsjAcual);
+								s.setFcsjActual(fcsj);
+								listInfo.add(s);
+							}
+			            }
 					}
 				} catch (ParseException e) {