车队查询，BUG修正

娄高锋
1 parent 55a4a539
Showing 1 changed file with 16 additions and 10 deletions
src/main/java/com/bsth/server_rs/bigdata/BigscreenService.java
@@ -588,7 +588,7 @@ public class BigscreenService {
     }
     /**给大屏的线路数、班次、里程汇总接口
-     * 按直属公司查询
+     * 按车队查询
      */
     @GET
     @Path("/selectData/getBigScreen/{gsdm}")
@@ -633,7 +633,7 @@ public class BigscreenService {
     		}
     	}
-    	String lineSql="SELECT b.start_opt,a.company,a.line_code,a.name,a.level,"
+    	String lineSql="SELECT b.start_opt,a.company,a.branche_company,a.line_code,a.name,a.level,"
     			+ " a.shanghai_linecode, a.nature from "
     			+ " bsth_c_line a left join bsth_c_line_config b "
     			+ " on a.id=b.line where "
@@ -647,6 +647,7 @@ public class BigscreenService {
 						m.put("state", rs.getString("start_opt"));
 						m.put("company", rs.getString("company"));
 						m.put("companyName", getGs(rs.getString("company")));
+						m.put("brancheCompany", rs.getString("branche_company"));
 						m.put("lineCode",rs.getString("line_code"));
 						m.put("name", rs.getString("name"));
 						m.put("level", rs.getString("level"));
@@ -658,7 +659,8 @@ public class BigscreenService {
     	int level1 = 0, level2 = 0, lineCount = 0;
     	for(Map<String, Object> t : lineList){
-    		if(t.containsKey("company") && t.get("company").toString().trim().equals(gsdm)){
+    		if(t.containsKey("company") && t.get("company").toString().trim().equals("77") &&
+    				t.containsKey("brancheCompany") && t.get("brancheCompany").toString().trim().equals(gsdm)){
     			++lineCount;
 	    		if(t.get("level") != null){
 	    			if("1".equals(t.get("level").toString())){
@@ -696,9 +698,9 @@ public class BigscreenService {
     			+ " jhsmbcs,sjsmbczds,smbczdl,jhsmbcsz,sjsmbczdsz,smbczdlz,"
     			+ " jhszfcs,sjszfczds,szfczdl,create_date"
     			+ " from bsth_c_calc_count "
-    			+ " where date >= '"+date2+"' and date <= '"+date+"' and gsdm = '"+gsdm+"'";
+    			+ " where date >= ? and date <= ? and gsdm = '77' and fgsdm = ?";
-    	List<Map<String, Object>> list=jdbcTemplate.query(sql,
+    	List<Map<String, Object>> list=jdbcTemplate.query(sql, new Object[]{date2, date, gsdm},
 				new RowMapper<Map<String, Object>>(){
 					@Override
 					public Map<String, Object>  mapRow(ResultSet rs, int rowNum) throws SQLException {
@@ -847,7 +849,8 @@ public class BigscreenService {
 	    		Map<String, Object> qkMap = qkList.get(datesMap.get(d));
 	    		long jh = 0, sj = 0;
 	    		for(ScheduleRealInfo s : findAll){
-	    			if(s.getGsBm() != null && s.getGsBm().trim().equals(gsdm)){
+	    			if(s.getGsBm() != null && s.getGsBm().trim().equals("77") &&
+	    					s.getFgsBm() != null && s.getFgsBm().trim().equals(gsdm)){
 		    			if(s.getXlBm() != null && yyLine.contains(s.getXlBm())){//营运线路
 			    			if(!isInOut(s) && !s.isCcService() && s.getStatus() != -1 && s.getStatus() != 0){
 			    				++jh;
@@ -903,7 +906,8 @@ public class BigscreenService {
     	List<ScheduleRealInfo> listSche = new ArrayList<ScheduleRealInfo>();
     	List<ScheduleRealInfo> list_s = new ArrayList<ScheduleRealInfo>();
     	for(ScheduleRealInfo s : findAll){
-    		if(s.getGsBm() != null && s.getGsBm().trim().equals(gsdm)){
+    		if(s.getGsBm() != null && s.getGsBm().trim().equals("77") &&
+    				s.getFgsBm() != null && s.getFgsBm().trim().equals(gsdm)){
 	    		if(s.getXlBm() != null && yyLine.contains(s.getXlBm())){//营运线路
 	    			listSche.add(s);
 	    			Set<ChildTaskPlan> cts = s.getcTasks();
@@ -1500,7 +1504,8 @@ public class BigscreenService {
         	List<ScheduleRealInfo> findAll = scheduleRealInfoRepository.findAll(dates[i]);
         	List<ScheduleRealInfo> list_s = new ArrayList<ScheduleRealInfo>();
         	for(ScheduleRealInfo s : findAll){
-        		if(s.getFgsBm() != null && s.getFgsBm().equals(gsdm)){//直属公司
+        		if(s.getGsBm() != null && s.getGsBm().equals("77") &&
+        				s.getFgsBm() != null && s.getFgsBm().equals(gsdm)){//车队
 	        		if(s.getXlBm() != null && yyLine.contains(s.getXlBm())){//营运线路
 	        			if(!isInOut(s)){
 		        			Set<ChildTaskPlan> cts = s.getcTasks();
@@ -1528,7 +1533,8 @@ public class BigscreenService {
         	for(ScheduleRealInfo s : findAll){
         		try {
-	        		if(s.getFgsBm() != null && s.getFgsBm().equals(gsdm)){//直属公司
+	        		if(s.getGsBm() != null && s.getGsBm().equals("77") &&
+	        				s.getFgsBm() != null && s.getFgsBm().equals(gsdm)){//车队
 		        		if(s.getXlBm() != null && yyLine.contains(s.getXlBm())){//营运线路
 			        		if (s.isSflj() || isInOut(s)){
 			                    continue;
@@ -1604,7 +1610,7 @@ public class BigscreenService {
     			+ " left join bsth_c_business b on p.company_code = b.up_code"
     			+ " and p.branche_company_code = b.business_code"
     			+ " where p.company_code = '77'"
-				+ " where p.branche_company_code = ?"
+				+ " and p.branche_company_code = ?"
     			+ " group by p.branche_company_code, b.business_name"
     			+ " order by p.branche_company_code";
     	List<Map<String, Object>> ecList=jdbcTemplate.query(gpLineSql, new Object[]{gsdm},