接口参数中加线路的权证配车数

娄高锋
1 parent b1122571
Showing 1 changed file with 11 additions and 1 deletions
src/main/java/com/bsth/server_rs/bigdata/BigdataService.java
@@ -1786,7 +1786,8 @@ public class BigdataService {
 		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 		Date rq = sdf.parse(date);
  
-		String xlSql="SELECT line_code, name, nature from bsth_c_line where name is not null and name != ''";
+		String xlSql="SELECT line_code, name, nature, ifnull(warrant_car, '') warrant_car"
+				+ " from bsth_c_line where name is not null and name != ''";
     	List<Map<String, Object>> xlList=jdbcTemplate.query(xlSql,
 				new RowMapper<Map<String, Object>>(){
 					@Override
@@ -1795,14 +1796,17 @@ public class BigdataService {
 						m.put("lineCode", rs.getString("line_code"));
 						m.put("lineName", rs.getString("name"));
 						m.put("nature", rs.getString("nature"));
+						m.put("warrantCar", rs.getString("warrant_car"));
 						return m;
 					}
 				});
     	Set<String> yyLine = new HashSet<String>();
     	Map<String, Object> allLineMap = new HashMap<String, Object>();
+    	Map<String, String> warrantCarMap = new HashMap<String, String>();
     	for(Map<String, Object> t : xlList){
     		if(t.get("lineCode") != null){
     			allLineMap.put(t.get("lineCode").toString(), t.get("lineName").toString());
+    			warrantCarMap.put(t.get("lineCode").toString(), t.get("warrantCar").toString());
     			String nature = t.get("nature")!=null?t.get("nature").toString():"";
     			if("yxl".equals(nature) || "cgxl".equals(nature) || "gjxl".equals(nature)
     					|| "csbs".equals(nature) || "cctxl".equals(nature)){
@@ -2047,6 +2051,12 @@ public class BigdataService {
 		for(String key : xlMap.keySet()){
 			Map<String, Object> m = xlMap.get(key);
 			m.put("cars", carsMap.get(key));
+			String xl = m.get("xl").toString();
+			if(warrantCarMap.containsKey(xl)){
+				m.put("warrantCar", warrantCarMap.get(xl));
+			} else {
+				m.put("warrantCar", "");
+			}
 			resList.add(m);
 		}