Commit 47d423b5227539a35cb5060d63c14602c67dc287
1 parent
1545a255
update
Showing
2 changed files
with
4 additions
and
5 deletions
src/main/java/com/bsth/service/schedule/impl/PeopleCarPlanServiceImpl.java
| @@ -396,7 +396,6 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService { | @@ -396,7 +396,6 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService { | ||
| 396 | if(!schedule.isSflj() && schedule.getFcsj() != null && schedule.getZdsj() != null){ | 396 | if(!schedule.isSflj() && schedule.getFcsj() != null && schedule.getZdsj() != null){ |
| 397 | if(!schedule.getBcType().equals("in") && !schedule.getBcType().equals("out") && !schedule.getBcType().equals("ldks")){ | 397 | if(!schedule.getBcType().equals("in") && !schedule.getBcType().equals("out") && !schedule.getBcType().equals("ldks")){ |
| 398 | jhbc++; | 398 | jhbc++; |
| 399 | - System.out.print((""+schedule.isSflj()).equals("false")?"":"X" + " "); | ||
| 400 | } | 399 | } |
| 401 | if(schedule.getBcType().equals("out")) | 400 | if(schedule.getBcType().equals("out")) |
| 402 | jhcc++; | 401 | jhcc++; |
| @@ -1309,7 +1308,7 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService { | @@ -1309,7 +1308,7 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService { | ||
| 1309 | if(schedule.getFcsjActual() != null){ | 1308 | if(schedule.getFcsjActual() != null){ |
| 1310 | String[] split = schedule.getFcsjActual().split(":"); | 1309 | String[] split = schedule.getFcsjActual().split(":"); |
| 1311 | int fcsjA = Integer.valueOf(split[0]) * 60 + Integer.valueOf(split[1]); | 1310 | int fcsjA = Integer.valueOf(split[0]) * 60 + Integer.valueOf(split[1]); |
| 1312 | - if(fcsjA < startOpt || !schedule.getRealExecDate().equals(schedule.getScheduleDateStr())) | 1311 | + if(fcsjA < startOpt) |
| 1313 | fcsjA += 1440; | 1312 | fcsjA += 1440; |
| 1314 | schedule.setFcsjActualTime((long)fcsjA); | 1313 | schedule.setFcsjActualTime((long)fcsjA); |
| 1315 | } | 1314 | } |
| @@ -1536,7 +1535,7 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService { | @@ -1536,7 +1535,7 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService { | ||
| 1536 | if(schedule.getFcsjActual() != null){ | 1535 | if(schedule.getFcsjActual() != null){ |
| 1537 | String[] split = schedule.getFcsjActual().split(":"); | 1536 | String[] split = schedule.getFcsjActual().split(":"); |
| 1538 | int fcsjA = Integer.valueOf(split[0]) * 60 + Integer.valueOf(split[1]); | 1537 | int fcsjA = Integer.valueOf(split[0]) * 60 + Integer.valueOf(split[1]); |
| 1539 | - if(fcsjA < startOpt || !schedule.getRealExecDate().equals(schedule.getScheduleDateStr())) | 1538 | + if(fcsjA < startOpt) |
| 1540 | fcsjA += 1440; | 1539 | fcsjA += 1440; |
| 1541 | schedule.setFcsjActualTime((long)fcsjA); | 1540 | schedule.setFcsjActualTime((long)fcsjA); |
| 1542 | } | 1541 | } |
src/main/resources/static/pages/forms/statement/firstAndLastBus_sum.html
| @@ -262,7 +262,7 @@ | @@ -262,7 +262,7 @@ | ||
| 262 | $("#map tr").addClass("hidden"); | 262 | $("#map tr").addClass("hidden"); |
| 263 | $get('/pcpc/firstAndLastBus_sum', params, function(result){ | 263 | $get('/pcpc/firstAndLastBus_sum', params, function(result){ |
| 264 | // 把数据填充到模版中 | 264 | // 把数据填充到模版中 |
| 265 | - var tbodyHtml = template('list_firstAndLastBus',{list:result}); | 265 | + var tbodyHtml = template('list_firstAndLastBus_sum',{list:result}); |
| 266 | // 把渲染好的模版html文本追加到表格中 | 266 | // 把渲染好的模版html文本追加到表格中 |
| 267 | $('#forms tbody').html(tbodyHtml); | 267 | $('#forms tbody').html(tbodyHtml); |
| 268 | 268 | ||
| @@ -292,7 +292,7 @@ | @@ -292,7 +292,7 @@ | ||
| 292 | }); | 292 | }); |
| 293 | 293 | ||
| 294 | </script> | 294 | </script> |
| 295 | -<script type="text/html" id="list_firstAndLastBus"> | 295 | +<script type="text/html" id="list_firstAndLastBus_sum"> |
| 296 | {{each list as obj i}} | 296 | {{each list as obj i}} |
| 297 | <tr> | 297 | <tr> |
| 298 | {{if obj.date != '合计汇总'}} | 298 | {{if obj.date != '合计汇总'}} |