潘钊 / bsth_control · Commits

Commit 0412c74df1ad60fc1380f734972d651a8018db50

Authored by 娄高锋
1 parent 351a4ce2
build: skipped

油量进出场表中加油公里 为空或者 为0非空 时可以获取加油里程

Inline Side-by-side
Showing 2 changed files with 7 additions and 7 deletions
src/main/java/com/bsth/service/oil/impl/YlbServiceImpl.java
  View file @0412c74
... ... @@ -210,7 +210,7 @@ public class YlbServiceImpl extends BaseServiceImpl<Ylb,Integer> implements YlbS
210 210 if(type.equals("update")){
211 211 repository.save(t);
212 212 }else{
213   - if(t.getJylc()==null && t.getJzl()>0){
  213 + if((t.getJylc()==null || t.getJylc()==0) && t.getJzl()>0){
214 214 t.setJylc(ginfoMap.get(t.getXlbm()+"-"+t.getLp()));
215 215 }
216 216 addList.add(t);
... ... @@ -219,8 +219,8 @@ public class YlbServiceImpl extends BaseServiceImpl<Ylb,Integer> implements YlbS
219 219 }
220 220 }
221 221  
222   - }
223   - if(addList.size()>0){
  222 + }
  223 + if(addList.size()>0){
224 224 try {
225 225  
226 226 new BatchSaveUtils<Ylb>().saveList2(addList, Ylb.class);
... ... @@ -854,12 +854,12 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
854 854 if(!(t.getSsgsdm().equals("") || t.getFgsdm().equals(""))){
855 855 if(type.equals("add")){
856 856 t.setCreatetime(date);
857   - if(t.getJylc()==null && t.getJzl()>0){
  857 + if((t.getJylc()==null || t.getJylc()==0) && t.getJzl()>0){
858 858 t.setJylc(ginfoMap.get(t.getXlbm()+"-"+t.getLp()));
859 859 }
860 860 addList.add(t);
861 861 }else{
862   - if(t.getJylc()==null && t.getJzl()>0){
  862 + if((t.getJylc()==null || t.getJylc()==0) && t.getJzl()>0){
863 863 t.setJylc(ginfoMap.get(t.getXlbm()+"-"+t.getLp()));
864 864 }
865 865 t.setUpdatetime(date);
... ...
src/main/resources/static/pages/oil/list_ph.html
  View file @0412c74
... ... @@ -444,8 +444,8 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep
444 444 }
445 445  
446 446 var jylc=$('.in_carpark_jylc[data-id='+id+']', '#ll_oil_list').val();
447   - if(jylc==""||jylc==null){
448   - jylc=0;
  447 + if(jylc==""||jylc==null||jylc=="0"){
  448 + jylc="";
449 449 }
450 450 var rylx= $('.in_carpark_rylx[data-id='+id+']', '#ll_oil_list').val();
451 451 var yhlx = $('.in_carpark_yhlx[data-id='+id+']', '#ll_oil_list').val();
... ...