update

娄高锋
1 parent 54bdf7ba
Showing 5 changed files with 36 additions and 19 deletions
src/main/java/com/bsth/service/forms/impl/FormsServiceImpl.java
src/main/java/com/bsth/service/impl/BusIntervalServiceImpl.java
src/main/java/com/bsth/service/schedule/impl/PeopleCarPlanServiceImpl.java
src/main/resources/static/pages/forms/statement/busInterval.html
src/main/resources/static/pages/forms/statement/scheduleAnaly_sum.html
@@ -1099,7 +1099,7 @@ public class FormsServiceImpl implements FormsService {
 						if (cts != null && cts.size() > 0) {
 							newList.add(s);
 						} else {
-							if (s.getZdsjActual() != null) {
+							if (s.getZdsjActual() != null && s.getFcsjActual() != null) {
 								newList.add(s);
 							}
 						}
@@ -1184,7 +1184,7 @@ public class FormsServiceImpl implements FormsService {
 					if (cts != null && cts.size() > 0) {
 						newList_.add(s);
 					} else {
-						if (s.getZdsjActual() != null) {
+						if (s.getZdsjActual() != null && s.getFcsjActual() != null) {
 							newList_.add(s);
 						}
 					}
@@ -418,7 +418,8 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 				for(ScheduleRealInfo schedule : keyMap2.get(date)){
 					if(schedule.getFcsjT() != null && !schedule.isSflj())
 						fcsjs.add(schedule.getFcsjT());
-					if(schedule.getFcsjActualTime() != null && schedule.getStatus() != -1)
+					if(schedule.getFcsjActualTime() != null && schedule.getZdsjActualTime() != null
+							&& schedule.getStatus() != -1)
 						fcsjAs.add(schedule.getFcsjActualTime());
 				}
 				Collections.sort(fcsjs);
@@ -1686,7 +1687,8 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 					jhbc++;
 					jhlc = jhlc.add(lc);
 				}
-				if(schedule.getStatus() != -1 && !schedule.isCcService()){
+				if(schedule.getFcsjActual() != null && schedule.getZdsjActual() != null
+						&& schedule.getStatus() != -1 && !schedule.isCcService()){
 					sjbc++;
 					sjlc = sjlc.add(lc);
 				} else if(schedule.getStatus() == -1 && !schedule.isCcService()){
@@ -1920,8 +1922,8 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 					dxtz = 0, lbtz = 0;
 			for(ScheduleRealInfo schedule : keyMap.get(key)){
 				boolean flag = false;
-				if(schedule.getFcsjActual() != null && schedule.getStatus() != -1
-						&& !schedule.isCcService()){
+				if(schedule.getFcsjActual() != null && schedule.getZdsjActual() != null
+						&& schedule.getStatus() != -1 && !schedule.isCcService()){
 					sjbc++;
 					if(schedule.getDfsj() != null && !schedule.getDfsj().equals(schedule.getFcsj())){
 						flag = true;
@@ -80,6 +80,7 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 					schedule.setsGh(rs.getString("s_gh"));
 					schedule.setsName(rs.getString("s_name"));
 					schedule.setSpId(rs.getLong("sp_id"));
+					schedule.setSflj(rs.getBoolean("sflj"));
 					schedule.setCcService(rs.getBoolean("cc_service"));
 					if(schedule.getFcsjActual() != null && schedule.getFcsjActual().trim().length() == 0){
@@ -224,8 +225,12 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 		//分组计算路程公里
 		for(SchedulePlanInfo schedule : list){
+			if(schedule.getsName() != null && schedule.getsName().trim().equals("")){
+				schedule.setsName(null);
+			}
 			String key = schedule.getXlName() + "/" + schedule.getLpName() + "/" +
 					schedule.getClZbh() + "/" + schedule.getjName() + "/" + schedule.getsName();
+			key = key.trim();
 			if(!keyMap.containsKey(key))
 				keyMap.put(key, new ArrayList<SchedulePlanInfo>());
 			keyMap.get(key).add(schedule);
@@ -273,10 +278,11 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 					str += (int)lp.charAt(i);
 				}
 				Long i = Long.valueOf(str);
-				if(!tempList.containsKey(i))
+				if(!tempList.containsKey(i)){
 					tempList.put(i, new ArrayList<Map<String, Object>>());
+					keyList.add(i);
+				}
 				tempList.get(i).add(m);
-				keyList.add(i);
 			}
 			Collections.sort(keyList);
 			for(Long i : keyList){
@@ -387,14 +393,22 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 				}
 				//班次数和出场数
-				jhbc++;
-				if(schedule.getBcType().equals("out"))
-					jhcc++;
+				if(!schedule.isSflj() && schedule.getFcsj() != null && schedule.getZdsj() != null){
+					if(!schedule.getBcType().equals("in") && !schedule.getBcType().equals("out") && !schedule.getBcType().equals("ldks")){
+						jhbc++;
+						System.out.print((""+schedule.isSflj()).equals("false")?"":"X" + " ");
+					}
+					if(schedule.getBcType().equals("out"))
+						jhcc++;
+				}
+				if(schedule.getStatus() != -1 && schedule.getBcType().equals("out"))
+					sjcc++;
+				if(!schedule.getBcType().equals("in") && !schedule.getBcType().equals("out") && !schedule.getBcType().equals("ldks")
+						&& schedule.getFcsjActual() != null && schedule.getZdsjActual() != null && schedule.getStatus() != -1){
+				
 				//发出时间快慢
 				if(schedule.getFcsjActual() != null){
-					if(schedule.getBcType().equals("out"))
-						sjcc++;
 //					schedule.setFcsjActualAll(schedule.getFcsjActual());
 					if(schedule.getFcsjActualTime() - schedule.getFcsjT() < -1){
 						if(schedule.getXlDir().equals("0"))
@@ -434,14 +448,15 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 					}
 				}
-				if(!schedule.getBcType().equals("in") && !schedule.getBcType().equals("out")
-						&& !schedule.getBcType().equals("ldks") && schedule.getFcsjActual() != null){
+				if(!schedule.getBcType().equals("in") && !schedule.getBcType().equals("out") && !schedule.getBcType().equals("ldks")
+						&& schedule.getFcsjActual() != null && schedule.getZdsjActual() != null){
 //					String clZbh = schedule.getClZbh();
 					String xlDir = schedule.getXlDir();
 					if(!listMap.containsKey(xlDir))
 						listMap.put(xlDir, new ArrayList<ScheduleRealInfo>());
 					listMap.get(xlDir).add(schedule);
 				}
+				}
 			}
 			//求首末班准点率
@@ -308,7 +308,7 @@
 // 			$(".hidden").removeClass("hidden");
 			$get('/busInterval/interval', params, function(result){
 				// 把数据填充到模版中
-				var tbodyHtml = template('list_workDaily',{list:result,statu:statu});
+				var tbodyHtml = template('list_busInteval',{list:result,statu:statu});
 				// 把渲染好的模版html文本追加到表格中
 				$('#forms').html(tbodyHtml);
 				_w_table_rowspan("#forms tbody", 1);
@@ -440,7 +440,7 @@
 	});
 </script>
-<script type="text/html" id="list_workDaily">
+<script type="text/html" id="list_busInteval">
 <thead>
 	<tr>
 		<th>日期</th>
@@ -257,7 +257,7 @@
 			$(".hidden").removeClass("hidden");
 			$get('/pcpc/scheduleAnaly_sum', params, function(result){
 				// 把数据填充到模版中
-				var tbodyHtml = template('list_scheduleAnaly',{list:result.dataList, companyName:companyName, subCompanyName:subCompanyName});
+				var tbodyHtml = template('list_scheduleAnaly_sum',{list:result.dataList, companyName:companyName, subCompanyName:subCompanyName});
 				// 把渲染好的模版html文本追加到表格中
 				$('#forms tbody').html(tbodyHtml);
@@ -384,7 +384,7 @@
 	});
 </script>
-<script type="text/html" id="list_scheduleAnaly">
+<script type="text/html" id="list_scheduleAnaly_sum">
 	{{each list as obj i}}
 		<tr>
 			<th style="display: none;"></th>