Commit aa1c00fddf7916ff67e1668c56d2b3c7613d017c
1 parent
41aa7378
闵行烂班类型中“肇事”叫“事故”,接口相应的更改。
Showing
1 changed file
with
6 additions
and
6 deletions
src/main/java/com/bsth/server_rs/bigdata/BigdataService.java
| @@ -1335,11 +1335,11 @@ public class BigdataService { | @@ -1335,11 +1335,11 @@ public class BigdataService { | ||
| 1335 | String sql="select gs_bm,fgs_bm,real_exec_date,fcsj,fcsj_actual,xl_name,j_gh,j_name,cl_zbh,car_plate,remarks " | 1335 | String sql="select gs_bm,fgs_bm,real_exec_date,fcsj,fcsj_actual,xl_name,j_gh,j_name,cl_zbh,car_plate,remarks " |
| 1336 | + " from bsth_c_s_sp_info_real r left join bsth_c_cars c on r.cl_zbh = c.inside_code " | 1336 | + " from bsth_c_s_sp_info_real r left join bsth_c_cars c on r.cl_zbh = c.inside_code " |
| 1337 | + " where schedule_date_str >= ? and schedule_date_str <= ? " | 1337 | + " where schedule_date_str >= ? and schedule_date_str <= ? " |
| 1338 | - + " and ((adjust_exps like '%肇事%' and status = '-1') " | ||
| 1339 | - + " or (schedule_date_str < '2021-09-13' and (remarks = '肇事' " | ||
| 1340 | - + " or remarks like '%;肇事%' or remarks like '%肇事;%' or remarks like '%肇事,%')) " | ||
| 1341 | - + " or (schedule_date_str >= '2021-09-13' and (remarks like '%<肇事>%' " | ||
| 1342 | - + " or remarks like '%<肇事>%'))) " | 1338 | + + " and ((adjust_exps like '%事故%' and status = '-1') " |
| 1339 | + + " or (schedule_date_str < '2021-09-13' and (remarks = '事故' " | ||
| 1340 | + + " or remarks like '%;事故%' or remarks like '%事故;%' or remarks like '%事故,%')) " | ||
| 1341 | + + " or (schedule_date_str >= '2021-09-13' and (remarks like '%<事故>%' " | ||
| 1342 | + + " or remarks like '%<事故>%'))) " | ||
| 1343 | + " order by real_exec_date, schedule_date_str, fcsj"; | 1343 | + " order by real_exec_date, schedule_date_str, fcsj"; |
| 1344 | 1344 | ||
| 1345 | List<Map<String, Object>> list=(List<Map<String, Object>>) jdbcTemplate.query(sql, | 1345 | List<Map<String, Object>> list=(List<Map<String, Object>>) jdbcTemplate.query(sql, |
| @@ -1368,7 +1368,7 @@ public class BigdataService { | @@ -1368,7 +1368,7 @@ public class BigdataService { | ||
| 1368 | Date d2 = sdf.parse(endDate); | 1368 | Date d2 = sdf.parse(endDate); |
| 1369 | while(d1.getTime() <= d2.getTime()){ | 1369 | while(d1.getTime() <= d2.getTime()){ |
| 1370 | String rq = sdf.format(d1); | 1370 | String rq = sdf.format(d1); |
| 1371 | - List<DestroySituation> destroys = destroySituationRepository.findByDateAndReason(rq, "肇事"); | 1371 | + List<DestroySituation> destroys = destroySituationRepository.findByDateAndReason(rq, "事故"); |
| 1372 | for(DestroySituation ds : destroys){ | 1372 | for(DestroySituation ds : destroys){ |
| 1373 | ScheduleRealInfo s = scheduleRealInfoRepository.findOne(Long.parseLong(ds.getIdsStr().split(",")[0])); | 1373 | ScheduleRealInfo s = scheduleRealInfoRepository.findOne(Long.parseLong(ds.getIdsStr().split(",")[0])); |
| 1374 | Map<String, Object> m = new HashMap<String, Object>(); | 1374 | Map<String, Object> m = new HashMap<String, Object>(); |