修正线路公里审计的预统计方法更新历史线路时会报错的问题；路单月报年报计算与查询统一使用rqStr字段；

娄高锋
1 parent f9d47b4e
Showing 2 changed files with 27 additions and 17 deletions
src/main/java/com/bsth/service/calc/impl/CalcWaybillServiceImpl.java
src/main/java/com/bsth/service/report/impl/ReportServiceImpl.java
@@ -1366,11 +1366,15 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
 		try {
-			String gsSql="select gs_bm, fgs_bm from bsth_c_s_sp_info_real where schedule_date_str = '"+date+"'";
-	        if(line.trim().length() > 0)
-	        	gsSql += " and xl_bm = '"+line+"'";
+			List<String> objList = new ArrayList<String>();
+			objList.add(date);
+			String gsSql="select gs_bm, fgs_bm from bsth_c_s_sp_info_real where schedule_date_str = ?";
+	        if(line.trim().length() > 0){
+	        	gsSql += " and xl_bm = ?";
+	        	objList.add(line);
+	        }
 			gsSql += " group by gs_bm, fgs_bm";
-			List<Map<String, String>> gsList=jdbcTemplate.query(gsSql, new RowMapper<Map<String, String>>() {
+			List<Map<String, String>> gsList=jdbcTemplate.query(gsSql, objList.toArray(), new RowMapper<Map<String, String>>() {
 				@Override
 				public Map<String, String> mapRow(ResultSet arg0, int arg1) throws SQLException {
 					Map<String, String> m = new HashMap<String, String>();
@@ -1485,12 +1489,16 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
 		try {
+			List<String> objList = new ArrayList<String>();
+			objList.add(date);
 			String gsSql="select gs_bm, max(gs_name) gs_name, fgs_bm from bsth_c_s_sp_info_real"
-					+ " where schedule_date_str = '"+date+"'";
-	        if(line.trim().length() > 0)
-	        	gsSql += " and xl_bm = '"+line+"'";
+					+ " where schedule_date_str = ?";
+	        if(line.trim().length() > 0){
+	        	gsSql += " and xl_bm = ?";
+	        	objList.add(line);
+	        }
 			gsSql += " group by gs_bm, fgs_bm";
-			List<Map<String, String>> gsList=jdbcTemplate.query(gsSql, new RowMapper<Map<String, String>>() {
+			List<Map<String, String>> gsList=jdbcTemplate.query(gsSql, objList.toArray(), new RowMapper<Map<String, String>>() {
 				@Override
 				public Map<String, String> mapRow(ResultSet arg0, int arg1) throws SQLException {
 					Map<String, String> m = new HashMap<String, String>();
@@ -1500,7 +1508,7 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
 					return m;
 			}});
-			List<Line> xlList = lineRepository.findAllService();
+			List<Line> xlList = lineRepository.findAll();
 			for(Line l : xlList){
 				xlmap.put(l.getName(), l.getLineCode());
 			}
@@ -1523,7 +1531,11 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
 					c.setGsName(tempMap.get("gsName").toString());
 					c.setFgsdm(map.get("fgsdm").toString());
 					c.setFgsName(m.get("fgs").toString());
-					c.setXl(xlmap.get(m.get("xlName").toString()).toString());
+					if(m.containsKey("xlBm")){
+						c.setXl(m.get("xlBm").toString());
+					} else {
+						c.setXl(xlmap.get(m.get("xlName").toString()).toString());
+					}
 					c.setXlName(m.get("xlName").toString());
 					c.setNbbm(m.get("nbbm").toString());
 					c.setjGh(m.get("jGh").toString());
@@ -1907,6 +1919,7 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
 		return temp;
 	}
+	//240820重写，之前的写的太复杂了改多错多，新方法在下面：calcDetailMonthlyNew
 	@Override
 	public List<List<String>> calcDetailMonthly(Map<String, Object> map) {
 		SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
@@ -2012,7 +2025,6 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
 			}
 		}
-		System.out.println(new Date());
 		int flag = 0;
 		if("jsy".equals(statisticalObj)){
 			flag = 1;
@@ -2032,13 +2044,11 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
 		// List类转换
 		final List<CalcWaybillDetail> listNew = JSONArray.parseArray(JSON.toJSONString(list), CalcWaybillDetail.class);
-		System.out.println(new Date());
 		if(flag != 2)
 		try {
 			//查询出没有路单的加油充电，插入到上面查询的结果集中汇总计算。
 			List<Ylb> ylbNotSchedule = calcRepository.ylbNotSchedule(dateFormat.parse(startDate), dateFormat.parse(endDate), gsdm, fgsdm, destroy, line);
 			List<Dlb> dlbNotSchedule = calcRepository.dlbNotSchedule(dateFormat.parse(startDate), dateFormat.parse(endDate), gsdm, fgsdm, destroy, line);
-			System.out.println(new Date());
 			for(Ylb y : ylbNotSchedule){
 				Date ylbrq = y.getRq();
 				String ylbxl = y.getXlbm();
@@ -2281,7 +2291,6 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
 		} catch (Exception e) {
 			// TODO: handle exception
 		}
-		System.out.println(new Date());
 		if(listNew.size() <= 0){
 			return resList;
@@ -2748,7 +2757,6 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
 //		listEnd.add(df.format(allNum)+"/"+df.format(all));
 		listEnd.add(df.format(all));
 		resList.add(listEnd);
-		System.out.println(new Date());
 		return resList;
 	}
@@ -3057,9 +3065,9 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
 				String dd = "";
 				if("m".equals(timeType)){
-					dd = dateFormat.format(cw.getRq());
+					dd = cw.getRqStr();
 				} else if("y".equals(timeType)){
-					dd = dateFormatMon.format(cw.getRq());
+					dd = cw.getRqStr().substring(0, 7);
 				}
 				if(temp.containsKey(dd)){
 					if("".equals(temp.get(dd))){
@@ -2897,6 +2897,7 @@ public class ReportServiceImpl implements ReportService{
 				map.put("fgs", "");
 			}else{
 				map.put("xlName", list.get(0).getXlName());
+				map.put("xlBm", list.get(0).getXlBm());
 				map.put("gsBm", list.get(0).getGsBm());
 				map.put("fgsBm", list.get(0).getFgsBm());
 				map.put("gs", list.get(0).getGsName());
@@ -3391,6 +3392,7 @@ public class ReportServiceImpl implements ReportService{
 			}
 			newMap.put("fgs", BasicData.businessFgsCodeNameMap.get(fgsdm+"_"+gsdm));
 			newMap.put("xlName", BasicData.lineCode2NameMap.get(xl_bm));
+			newMap.put("xlBm", xl_bm);
 			newMap.put("jGh", jGh);
 			newMap.put("jName", jName);
 			newMap.put("sGh",sGh);