潘钊 / bsth_control · Commits

Commit 47d423b5227539a35cb5060d63c14602c67dc287

Authored by 娄高锋
1 parent 1545a255
build: skipped

update

Inline Side-by-side
Showing 2 changed files with 4 additions and 5 deletions
src/main/java/com/bsth/service/schedule/impl/PeopleCarPlanServiceImpl.java
  View file @47d423b
... ... @@ -396,7 +396,6 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
396 396 if(!schedule.isSflj() && schedule.getFcsj() != null && schedule.getZdsj() != null){
397 397 if(!schedule.getBcType().equals("in") && !schedule.getBcType().equals("out") && !schedule.getBcType().equals("ldks")){
398 398 jhbc++;
399   - System.out.print((""+schedule.isSflj()).equals("false")?"":"X" + " ");
400 399 }
401 400 if(schedule.getBcType().equals("out"))
402 401 jhcc++;
... ... @@ -1309,7 +1308,7 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
1309 1308 if(schedule.getFcsjActual() != null){
1310 1309 String[] split = schedule.getFcsjActual().split(":");
1311 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 1312 fcsjA += 1440;
1314 1313 schedule.setFcsjActualTime((long)fcsjA);
1315 1314 }
... ... @@ -1536,7 +1535,7 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
1536 1535 if(schedule.getFcsjActual() != null){
1537 1536 String[] split = schedule.getFcsjActual().split(":");
1538 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 1539 fcsjA += 1440;
1541 1540 schedule.setFcsjActualTime((long)fcsjA);
1542 1541 }
... ...
src/main/resources/static/pages/forms/statement/firstAndLastBus_sum.html
  View file @47d423b
... ... @@ -262,7 +262,7 @@
262 262 $("#map tr").addClass("hidden");
263 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 266 // 把渲染好的模版html文本追加到表格中
267 267 $('#forms tbody').html(tbodyHtml);
268 268  
... ... @@ -292,7 +292,7 @@
292 292 });
293 293  
294 294 </script>
295   -<script type="text/html" id="list_firstAndLastBus">
  295 +<script type="text/html" id="list_firstAndLastBus_sum">
296 296 {{each list as obj i}}
297 297 <tr>
298 298 {{if obj.date != '合计汇总'}}
... ...