Commit 07ae3e61221ec4eab9a0c53c2e866a959a78a535
1 parent
e4e24e2d
添加场外加油 忽略接入数据
Showing
1 changed file
with
2 additions
and
2 deletions
src/main/java/com/bsth/service/oil/impl/YlbServiceImpl.java
| @@ -404,7 +404,7 @@ public class YlbServiceImpl extends BaseServiceImpl<Ylb,Integer> implements YlbS | @@ -404,7 +404,7 @@ public class YlbServiceImpl extends BaseServiceImpl<Ylb,Integer> implements YlbS | ||
| 404 | Ylxxb ylxxb = ylxxList.get(i); | 404 | Ylxxb ylxxb = ylxxList.get(i); |
| 405 | if (map.get("clZbh").toString().equals(ylxxb.getNbbm()) | 405 | if (map.get("clZbh").toString().equals(ylxxb.getNbbm()) |
| 406 | && map.get("jGh").toString().equals(ylxxb.getJsy()) | 406 | && map.get("jGh").toString().equals(ylxxb.getJsy()) |
| 407 | - && ylxxb.getJylx()>0) { | 407 | + && ylxxb.getJylx()==1) { |
| 408 | if(ylxxb.getJzl()>0){ | 408 | if(ylxxb.getJzl()>0){ |
| 409 | fage2=true; | 409 | fage2=true; |
| 410 | } | 410 | } |
| @@ -418,7 +418,7 @@ public class YlbServiceImpl extends BaseServiceImpl<Ylb,Integer> implements YlbS | @@ -418,7 +418,7 @@ public class YlbServiceImpl extends BaseServiceImpl<Ylb,Integer> implements YlbS | ||
| 418 | Ylxxb ylxxb = ylxxList.get(j); | 418 | Ylxxb ylxxb = ylxxList.get(j); |
| 419 | if (map.get("clZbh").toString().equals(ylxxb.getNbbm()) | 419 | if (map.get("clZbh").toString().equals(ylxxb.getNbbm()) |
| 420 | && map.get("jGh").toString().equals(ylxxb.getJsy()) | 420 | && map.get("jGh").toString().equals(ylxxb.getJsy()) |
| 421 | - && ylxxb.getJylx()>0) { | 421 | + && ylxxb.getJylx()==1) { |
| 422 | jzl =Arith.add(jzl, ylxxb.getJzl()); | 422 | jzl =Arith.add(jzl, ylxxb.getJzl()); |
| 423 | } | 423 | } |
| 424 | } | 424 | } |