潘钊 / bsth_control · Commits

Commit 6f6f3169e2cadaecd9ed26c53e58f8f1c0c1088b

Authored by 廖磊
1 parent 8dfecfae

到离站跨天查询处理

Inline Side-by-side
Showing 4 changed files with 9 additions and 6 deletions
src/main/java/com/bsth/service/report/impl/ReportServiceImpl.java
  View file @6f6f316
... ... @@ -93,8 +93,10 @@ public class ReportServiceImpl implements ReportService{
93 93 String sbbb=BasicData.deviceId2NbbmMap.inverse().get(clzbh);
94 94 SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
95 95 SimpleDateFormat sdf = new SimpleDateFormat("HH:mm:ss");
96   - Long date1=simpleDateFormat.parse(date+" "+sjfc+":00").getTime();
97   - Long date2=simpleDateFormat.parse(date+" "+sjdd+":00").getTime();
  96 +// Long date1=simpleDateFormat.parse(date+" "+sjfc+":00").getTime();
  97 +// Long date2=simpleDateFormat.parse(date+" "+sjdd+":00").getTime();
  98 + Long date1=simpleDateFormat.parse(sjfc+":00").getTime();
  99 + Long date2=simpleDateFormat.parse(sjdd+":00").getTime();
98 100 Date dates=simpleDateFormat.parse(date+" 00:00:00");
99 101 List<ArrivalInfo> lists=load(line,sbbb,date1,date2,dates,date);
100 102  
... ...
src/main/resources/static/pages/electricity/list/list.html
  View file @6f6f316
... ... @@ -588,12 +588,13 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep
588 588  
589 589 function jsyUpdate(){
590 590 var params=getParamsList();
  591 + var id = $(this).data('id');
591 592 $get('/ylb/checkDate',params,function(status){
592 593 if(status=='2'){
593 594 layer.msg('只能操作三天内数据.');
594 595 }else{
595   - var id = $(this).data('id');
596 596 var jsy=$('.in_carpark_jsy[data-id='+id+']', '#dl_oil_list').val();
  597 + console.log(id+"修改驾驶员:"+jsy);
597 598 $get('/dlb/updateJsy',{id:id,jsy:jsy}, function(result){
598 599 layer.msg('修改成功.');
599 600 page = 0;
... ...
src/main/resources/static/pages/oil/list_ph.html
  View file @6f6f316
... ... @@ -764,10 +764,10 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep
764 764 function jsyUpdate(){
765 765 var params=getParamsList();
766 766 $get('/ylb/checkDate',params,function(status){
  767 + var id = $(this).data('id');
767 768 if(status=='2'){
768 769 layer.msg('只能操作三天内数据.');
769 770 }else{
770   - var id = $(this).data('id');
771 771 var jsy=$('.in_carpark_jsy[data-id='+id+']', '#ll_oil_list').val();
772 772 $get('/ylb/updateJsy',{id:id,jsy:jsy}, function(result){
773 773 layer.msg('修改成功.');
... ...
src/main/resources/static/pages/report/inoutstation.html
  View file @6f6f316
... ... @@ -557,8 +557,8 @@
557 557 整点
558 558 {{/if}}
559 559 )
560   - <span class="in_carpark_fcsj" data-id="{{i+1}}" style="display:none">{{obj.fcsjActual}}</span>
561   - <span class="in_carpark_zdsj" data-id="{{i+1}}" style="display:none">{{obj.zdsjActual}}</span>
  560 + <span class="in_carpark_fcsj" data-id="{{i+1}}" style="display:none">{{obj.realExecDate}} {{obj.fcsjActual}}</span>
  561 + <span class="in_carpark_zdsj" data-id="{{i+1}}" style="display:none">{{obj.realExecDate}} {{obj.zdsjActual}}</span>
562 562 </a>
563 563 {{/if}}
564 564 </td>
... ...