工单2022-0001：直放(班次类型：venting)班次不参与首末班统计；调度日报导出后备注内容没导出的问题修复。

娄高锋
1 parent 630b2012
Showing 2 changed files with 38 additions and 19 deletions
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
src/main/java/com/bsth/service/schedule/impl/PeopleCarPlanServiceImpl.java
@@ -5189,7 +5189,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
             }
             tempMap.put("fcsjk" + x, fcsjk);
             tempMap.put("fcsjm" + x, fcsjm.equals("0")?"":fcsjm);
-            tempMap.put("remarks" + x, schedule.getRemark() != null ? schedule.getRemark() : "");
+            tempMap.put("remarks" + x, schedule.getRemarks() != null ? schedule.getRemarks() : "");
             size++;
         }
@@ -1268,20 +1268,29 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 		if(date.length() == 0)
 			date = sdf.format(new Date());
+		List<String> strList = new ArrayList<String>();
+		strList.add(date);
+		
 		try {
 			String sql = "select a.schedule_date_str, a.real_exec_date, a.xl_name, a.fcsj, a.fcsj_actual, a.zdsj, a.zdsj_actual, a.qdz_name, a.zdz_name, a.xl_dir, a.status, a.gs_name, a.fgs_name,"
 					+ " a.xl_bm, a.fgs_bm, a.cc_service, (select start_opt from bsth_c_line_config where id ="
 					+ " (select max(id) from bsth_c_line_config where line = (select id from bsth_c_line where line_code = a.xl_bm))) start_opt"
-					+ " from bsth_c_s_sp_info_real a where schedule_date_str = '"+date+"'"
-					+ " and bc_type != 'in' and bc_type != 'out' and bc_type != 'ldks' and bc_type != 'region'";
-			if(line.trim().length() != 0)
-				sql += " and xl_bm = '"+line+"'";
-			if(company.length() != 0)
-				sql += " and gs_bm = '"+company+"'";
-			if(subCompany.length() != 0)
-				sql += " and fgs_bm = '"+subCompany+"'";
+					+ " from bsth_c_s_sp_info_real a where schedule_date_str = ?"
+					+ " and bc_type != 'in' and bc_type != 'out' and bc_type != 'ldks' and bc_type != 'region' and bc_type != 'venting'";
+			if(line.trim().length() != 0){
+				sql += " and xl_bm = ?";
+				strList.add(line);
+			}
+			if(company.length() != 0){
+				sql += " and gs_bm = ?";
+				strList.add(company);
+			}
+			if(subCompany.length() != 0){
+				sql += " and fgs_bm = ?";
+				strList.add(subCompany);
+			}
-			list = jdbcTemplate.query(sql,
+			list = jdbcTemplate.query(sql, strList.toArray(),
 					new RowMapper<ScheduleRealInfo>(){
 				@Override
 				public ScheduleRealInfo mapRow(ResultSet rs, int rowNum) throws SQLException {
@@ -1540,20 +1549,30 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 					+split2[0]+"年"+split2[1]+"月"+split2[2]+"日";
 		}
+		List<String> strList = new ArrayList<String>();
+		strList.add(startDate);
+		strList.add(endDate);
+		
 		try {
 			String sql = "select a.schedule_date_str, a.real_exec_date, a.xl_bm, a.xl_name, a.fcsj, a.fcsj_actual, a.zdsj, a.zdsj_actual, a.qdz_name, a.zdz_name, a.xl_dir, a.status, a.gs_name, a.fgs_name,"
 					+ " a.fgs_bm, a.cc_service, a.remarks, a.adjust_exps, (select start_opt from bsth_c_line_config where id = "
 					+ " (select max(id) from bsth_c_line_config where line = (select id from bsth_c_line where line_code = a.xl_bm))) start_opt"
-					+ " from bsth_c_s_sp_info_real a where schedule_date_str >= '"+startDate+"' and schedule_date_str <= '"+endDate+"'"
-					+ " and bc_type != 'in' and bc_type != 'out' and bc_type != 'ldks' and bc_type != 'region'";
-			if(line.length() != 0)
-				sql += " and xl_bm = '"+line+"'";
-			if(company.length() != 0)
-				sql += " and gs_bm = '"+company+"'";
-			if(subCompany.length() != 0)
-				sql += " and fgs_bm = '"+subCompany+"'";
+					+ " from bsth_c_s_sp_info_real a where schedule_date_str >= ? and schedule_date_str <= ?"
+					+ " and bc_type != 'in' and bc_type != 'out' and bc_type != 'ldks' and bc_type != 'region' and bc_type != 'venting'";
+			if(line.length() != 0){
+				sql += " and xl_bm = ?";
+				strList.add(line);
+			}
+			if(company.length() != 0){
+				sql += " and gs_bm = ?";
+				strList.add(company);
+			}
+			if(subCompany.length() != 0){
+				sql += " and fgs_bm = ?";
+				strList.add(subCompany);
+			}
-			list = jdbcTemplate.query(sql,
+			list = jdbcTemplate.query(sql, strList.toArray(),
 					new RowMapper<ScheduleRealInfo>(){
 				@Override
 				public ScheduleRealInfo mapRow(ResultSet rs, int rowNum) throws SQLException {