170106

廖磊
1 parent 8c10e233
Showing 8 changed files with 113 additions and 37 deletions
src/main/java/com/bsth/controller/oil/YlbController.java
src/main/java/com/bsth/repository/realcontrol/ScheduleRealInfoRepository.java
src/main/java/com/bsth/service/oil/impl/YlbServiceImpl.java
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
src/main/resources/application-dev.properties
src/main/resources/ms-jdbc.properties
src/main/resources/static/pages/forms/statement/scheduleDaily.html
src/main/resources/static/pages/report/timetable/timetable.html
@@ -106,24 +106,24 @@ public class YlbController extends BaseController&lt;Ylb, Integer&gt;{
 			@RequestParam(defaultValue = "DESC") String direction){
 		Direction d;
-		try {
+//		try {
 		String rq=map.get("rq").toString();
 		if(!(rq=="")){
-			
-			SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
-			  Calendar   calendar   =   new   GregorianCalendar(); 
-			  calendar.setTime(sdf.parse(rq)); 
-			  calendar.add(calendar.DATE,1);
-			  Date date=calendar.getTime();
-			map.put("rq_ge", rq);
-			map.put("rq_le", sdf.format(date));
-			System.out.println(rq);
-			System.out.println(sdf.format(date));
-		}
-		} catch (ParseException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
+//			
+//			SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
+//			  Calendar   calendar   =   new   GregorianCalendar(); 
+//			  calendar.setTime(sdf.parse(rq)); 
+//			  calendar.add(calendar.DATE,1);
+//			  Date date=calendar.getTime();
+			map.put("rq_eq", rq);
+//			map.put("rq_lt", sdf.format(date));
+//			System.out.println(rq);
+//			System.out.println(sdf.format(date));
 		}
+//		} catch (ParseException e) {
+//			// TODO Auto-generated catch block
+//			e.printStackTrace();
+//		}
 		if(null != direction && direction.equals("ASC"))
 			d = Direction.ASC;
 		else
@@ -110,7 +110,7 @@ public interface ScheduleRealInfoRepository extends BaseRepository&lt;ScheduleRealI
 	@Query(value="select s from ScheduleRealInfo s where s.xlBm like %?1%  and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2")
 	List<ScheduleRealInfo> scheduleByDateAndLine(String line,String date);
-	@Query(value="select new map(s.scheduleDate as scheduleDate,s.xlBm as xlBm,s.clZbh as clZbh,s.jGh as jGh) from ScheduleRealInfo s where s.xlBm like %?1% and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2 GROUP BY xlBm,clZbh,jGh,scheduleDate,jGh ORDER BY xlBm,clZbh")
+	@Query(value="select new map(s.scheduleDate as scheduleDate,s.xlBm as xlBm,s.clZbh as clZbh,s.jGh as jGh) from ScheduleRealInfo s where s.xlBm like %?1% and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2 GROUP BY xlBm,clZbh,jGh,scheduleDate,jGh ORDER BY realExecDate,fcsj,xlBm,clZbh")
 	List<Map<String,Object>> yesterdayDataList(String line,String date);
 	@Query(value="select s from ScheduleRealInfo s where DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?1 ORDER BY xlBm,lpName,clZbh,xlDir")
@@ -132,7 +132,7 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 				t.setJcsx(Integer.parseInt(map.get("seqNumber").toString()));
 				t.setSsgsdm(map.get("company")==null?"":map.get("company").toString());
 				t.setFgsdm(map.get("bCompany")==null?"":map.get("bCompany").toString());
-				t.setRq(dBefore);
+				t.setRq(sdf.parse(rq));
 				repository.save(t);
 				result = "success";
 			} catch (Exception e) {
@@ -1566,7 +1566,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 	@Override
 	public List<ScheduleRealInfo> realScheduleList(String line, String date) {
-		List<ScheduleRealInfo> listInfo = scheduleRealInfoRepository.queryUserInfo(line, date);
+		/*List<ScheduleRealInfo> listInfo = scheduleRealInfoRepository.queryUserInfo(line, date);
 		List<ScheduleRealInfo> listTotal = scheduleRealInfoRepository.scheduleByDateAndLine(line, date);
 		for(ScheduleRealInfo info:listInfo){
 			for(ScheduleRealInfo total:listTotal){
@@ -1574,7 +1574,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 				}
 			}
-		}
+		}*/
 		return scheduleRealInfoRepository.scheduleByDateAndLine(line, date);
 	}
@@ -1584,8 +1584,84 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 //		String date = sdfMonth.format(org.apache.commons.lang.time.DateUtils.addDays(new Date(), -1));
 //		String date = "2016-09-20";
 		List<Map<String,Object>> yesterdayDataList = scheduleRealInfoRepository.yesterdayDataList(line, date);
-		List<ScheduleRealInfo> list = scheduleRealInfoRepository.scheduleByDateAndLine(line, date);
-		for(ScheduleRealInfo scheduleRealInfo:list){
+//		List<ScheduleRealInfo> list = scheduleRealInfoRepository.scheduleByDateAndLine(line, date);
+		for(int x=0;x<yesterdayDataList.size();x++){
+			String jName=yesterdayDataList.get(x).get("jGh").toString();
+			String clZbh=yesterdayDataList.get(x).get("clZbh").toString();
+			List<ScheduleRealInfo> lists=scheduleRealInfoRepository.queryListWaybill3(jName, clZbh, date);
+			double jhlc = 0, yygl = 0, ksgl = 0,tempJhlc = 0,jcclc=0;
+			float addMileage = 0l,remMileage = 0l;
+			Map<String,Object> map = new HashMap<String, Object>();
+			boolean fage=true;
+			for(ScheduleRealInfo scheduleRealInfo : lists){
+				if(fage){
+					//根据线路代码获取公司
+					Line li = lineRepository.findByLineCode(scheduleRealInfo.getXlBm());
+					yesterdayDataList.get(x).put("company", li.getCompany());
+					yesterdayDataList.get(x).put("bCompany", li.getBrancheCompany());
+					fage=false;
+				}
+				if(scheduleRealInfo != null){
+					//计划里程（主任务过滤掉临加班次），
+					//烂班里程（主任务烂班），
+					//临加里程（主任务临加），
+					//计划班次，烂班班次，增加班次
+					tempJhlc = scheduleRealInfo.getJhlc()==null?0:scheduleRealInfo.getJhlc();
+					if(scheduleRealInfo.isSflj()){
+						addMileage += tempJhlc;
+					}else{
+						if( !(scheduleRealInfo.getBcType().equals("in")
+								||scheduleRealInfo.getBcType().equals("out")) ){
+							jhlc += tempJhlc;
+						}
+						
+						if(scheduleRealInfo.getStatus() == -1){
+							remMileage += tempJhlc;
+						}				
+					}
+					Set<ChildTaskPlan> childTaskPlans = scheduleRealInfo.getcTasks();
+					//计算营运里程，空驶里程
+					if(childTaskPlans.isEmpty()){
+						if(scheduleRealInfo.getBcType().equals("in") || 
+								scheduleRealInfo.getBcType().equals("out")){
+							jcclc +=tempJhlc;
+						}
+						//主任务 放空班次属于营运
+//						else if(scheduleRealInfo.getBcType().equals("venting")){
+//							ksgl += tempJhlc;
+//						}
+						else{
+							if(scheduleRealInfo.getStatus() != -1){
+								yygl += tempJhlc;
+							}
+						}	
+					}else{
+						Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
+						while(it.hasNext()){
+							ChildTaskPlan childTaskPlan = it.next();
+							if(childTaskPlan.getMileageType().equals("empty")){
+								if(childTaskPlan.isDestroy()){
+									remMileage += childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage();
+								}else{
+									ksgl += childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage();
+								}
+							}else{
+								if(childTaskPlan.isDestroy()){
+									remMileage += childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage();
+								}else{
+									yygl += childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage();
+								}
+							}
+						}
+					}
+				}
+			}
+			
+			yesterdayDataList.get(x).put("totalKilometers", yygl+ksgl+jcclc);
+		
+		}
+		
+		/*	for(ScheduleRealInfo scheduleRealInfo:list){
 			if(scheduleRealInfo != null){
 				for(int i=0;i<yesterdayDataList.size();i++){
 					if(scheduleRealInfo.getXlBm().equals(yesterdayDataList.get(i).get("xlBm")) && scheduleRealInfo.getClZbh().equals(yesterdayDataList.get(i).get("clZbh"))
@@ -1613,7 +1689,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 					}	
 				}
 			}
-		}
+		}*/
 		//增加顺序号
 		for(int i=0;i<yesterdayDataList.size();i++){
 			if(i == 0){
@@ -7,13 +7,13 @@ spring.jpa.hibernate.naming_strategy= org.hibernate.cfg.ImprovedNamingStrategy
 #DATABASE
 spring.jpa.database= MYSQL
 spring.jpa.show-sql= true
-spring.datasource.driver-class-name= com.mysql.jdbc.Driver
-spring.datasource.url= jdbc:mysql://127.0.0.1/qp_control?useUnicode=true&characterEncoding=utf-8&useSSL=false
-spring.datasource.username= root
-spring.datasource.password=
-#spring.datasource.url= jdbc:mysql://192.168.168.117/pd_control?useUnicode=true&characterEncoding=utf-8&useSSL=false
+#spring.datasource.driver-class-name= com.mysql.jdbc.Driver
+#spring.datasource.url= jdbc:mysql://192.168.168.201/mh_control?useUnicode=true&characterEncoding=utf-8&useSSL=false
 #spring.datasource.username= root
-#spring.datasource.password= root
+#spring.datasource.password= 123456
+spring.datasource.url= jdbc:mysql://localhost/mh_control?useUnicode=true&characterEncoding=utf-8&useSSL=false
+spring.datasource.username= root
+spring.datasource.password= root
 #DATASOURCE
 spring.datasource.max-active=100
 spring.datasource.max-idle=8
@@ -4,6 +4,6 @@
 #ms.mysql.password= 123456
 ms.mysql.driver= com.mysql.jdbc.Driver
-ms.mysql.url= jdbc:mysql://192.168.168.171:3306/ms?useUnicode=true&characterEncoding=utf-8
+ms.mysql.url= jdbc:mysql://192.168.168.117:3306/ms?useUnicode=true&characterEncoding=utf-8
 ms.mysql.username= root
-ms.mysql.password= root2jsp
 \ No newline at end of file
+ms.mysql.password= root
 \ No newline at end of file
@@ -269,7 +269,6 @@
 			for(var code in result){
 				data.push({id: code, text: result[code]});
 			}
-			console.log(data);
 			initPinYinSelect2('#line',data,'');
 		})
@@ -282,7 +281,8 @@
 				var scheduleDaily_1 = template('scheduleDaily_1',{list:result});
 				$('#forms .scheduleDaily_1').html(scheduleDaily_1);
 			});
-			$.get('/realSchedule/queryUserInfo',{line:line,date:date},function(result){
+			$.get('/realSchedule/queryUserInfo',{line:line,date:date,state:2},function(result){
+				console.log(result);
 				var scheduleDaily_2 = template('scheduleDaily_2',{list:result});
 				$('#forms .scheduleDaily_2').html(scheduleDaily_2);
 			});
@@ -346,10 +346,10 @@
 		{{if i%5 == 0}}
 			<tr>
 		{{/if}}
-				<td colspan="2">{{obj.lpName}}</td>
-				<td colspan="2">{{obj.clZbh}}</td>
-				<td>{{obj.jGh}}</td>
-				<td>{{obj.sGh}}</td>
+				<td colspan="2">{{obj[3]}}</td>
+				<td colspan="2">{{obj[2]}}</td>
+				<td>{{obj[4]}}</td>
+				<td>&nbsp;</td>
 				<td>&nbsp;</td>
 				<td>&nbsp;</td>
 		{{if (i+1)%5 == 0}}
@@ -234,7 +234,7 @@
 		$.get('/basic/lineCode2Name',function(result){
 			var data=[];
-			
+			data.push({id: "", text: "请选择"});
 			for(var code in result){
 				data.push({id: code, text: result[code]});
 			}