Commit 129ccd3dee82f32c420a8b24b0d7520885f2e02f
1 parent
05849f9c
LGF 报表
Showing
1 changed file
with
7 additions
and
5 deletions
src/main/java/com/bsth/service/schedule/PeopleCarPlanServiceImpl.java
| ... | ... | @@ -46,7 +46,7 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService { |
| 46 | 46 | if(company.length() != 0) |
| 47 | 47 | sql += " and gs_bm = '"+company+"' and fgs_bm = '"+subCompany+"'"; |
| 48 | 48 | |
| 49 | - list =jdbcTemplate.query(sql, | |
| 49 | + list = jdbcTemplate.query(sql, | |
| 50 | 50 | new RowMapper<ScheduleRealInfo>(){ |
| 51 | 51 | @Override |
| 52 | 52 | public ScheduleRealInfo mapRow(ResultSet rs, int rowNum) throws SQLException { |
| ... | ... | @@ -117,7 +117,7 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService { |
| 117 | 117 | sql += " and gs_bm = '"+company+"' and fgs_bm = '"+subCompany+"'"; |
| 118 | 118 | } |
| 119 | 119 | |
| 120 | - list =jdbcTemplate.query(sql, | |
| 120 | + list = jdbcTemplate.query(sql, | |
| 121 | 121 | new RowMapper<SchedulePlanInfo>(){ |
| 122 | 122 | @Override |
| 123 | 123 | public SchedulePlanInfo mapRow(ResultSet rs, int rowNum) throws SQLException { |
| ... | ... | @@ -362,13 +362,15 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService { |
| 362 | 362 | } |
| 363 | 363 | ScheduleRealInfo shouban = tempList.get(0); |
| 364 | 364 | ScheduleRealInfo moban = tempList.get(tempList.size() - 1); |
| 365 | +// System.out.println(shouban.getFcsjActual() + "-首班-" + shouban.getFcsj()); | |
| 366 | +// System.out.println(moban.getFcsjActual() + "-末班-" + moban.getFcsj()); | |
| 367 | + jhsb++; | |
| 365 | 368 | if(shouban.getFcsjActual() != null){ |
| 366 | - jhsb++; | |
| 367 | 369 | if(shouban.getFcsjActualTime() - shouban.getFcsjT() >= -60000 && shouban.getFcsjActualTime() - shouban.getFcsjT() <= 180000) |
| 368 | 370 | sjsb++; |
| 369 | 371 | } |
| 372 | + jhmb++; | |
| 370 | 373 | if(moban.getFcsjActual() != null){ |
| 371 | - jhmb++; | |
| 372 | 374 | if(moban.getFcsjActualTime() - moban.getFcsjT() >= -60000 && moban.getFcsjActualTime() - moban.getFcsjT() <= 180000) |
| 373 | 375 | sjmb++; |
| 374 | 376 | } |
| ... | ... | @@ -452,7 +454,7 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService { |
| 452 | 454 | } |
| 453 | 455 | sql += " and bc_type = 'normal'"; |
| 454 | 456 | |
| 455 | - list =jdbcTemplate.query(sql, | |
| 457 | + list = jdbcTemplate.query(sql, | |
| 456 | 458 | new RowMapper<ScheduleRealInfo>(){ |
| 457 | 459 | @Override |
| 458 | 460 | public ScheduleRealInfo mapRow(ResultSet rs, int rowNum) throws SQLException { | ... | ... |