Commit 1b76fec327fb6f95203741e2d14ed75d876a99f2
1 parent
19277052
油，电导出格式
Showing
3 changed files
with
18 additions
and
14 deletions
src/main/java/com/bsth/service/oil/impl/YlbServiceImpl.java
| @@ -135,9 +135,11 @@ public class YlbServiceImpl extends BaseServiceImpl<Ylb,Integer> implements YlbS | @@ -135,9 +135,11 @@ public class YlbServiceImpl extends BaseServiceImpl<Ylb,Integer> implements YlbS | ||
| 135 | Ylb ylb=ylListBe.get(i); | 135 | Ylb ylb=ylListBe.get(i); |
| 136 | if(map.get("clZbh").toString().equals(ylb.getNbbm())){ | 136 | if(map.get("clZbh").toString().equals(ylb.getNbbm())){ |
| 137 | if(ylb.getJzyl()!=null){ | 137 | if(ylb.getJzyl()!=null){ |
| 138 | - t.setCzyl(ylb.getJzyl()); | ||
| 139 | - fage=false; | ||
| 140 | - break; | 138 | + if(ylb.getJzyl()>0){ |
| 139 | + t.setCzyl(ylb.getJzyl()); | ||
| 140 | + fage=false; | ||
| 141 | + break; | ||
| 142 | + } | ||
| 141 | } | 143 | } |
| 142 | 144 | ||
| 143 | } | 145 | } |
| @@ -270,7 +272,7 @@ public class YlbServiceImpl extends BaseServiceImpl<Ylb,Integer> implements YlbS | @@ -270,7 +272,7 @@ public class YlbServiceImpl extends BaseServiceImpl<Ylb,Integer> implements YlbS | ||
| 270 | for (int i = 0; i < ylListBe.size(); i++) { | 272 | for (int i = 0; i < ylListBe.size(); i++) { |
| 271 | Ylb ylb = ylListBe.get(i); | 273 | Ylb ylb = ylListBe.get(i); |
| 272 | if (map.get("clZbh").toString().equals(ylb.getNbbm())) { | 274 | if (map.get("clZbh").toString().equals(ylb.getNbbm())) { |
| 273 | - if(ylb.getJzyl()>=0){ | 275 | + if(ylb.getJzyl()>0){ |
| 274 | t.setCzyl(ylb.getJzyl()); | 276 | t.setCzyl(ylb.getJzyl()); |
| 275 | fage = false; | 277 | fage = false; |
| 276 | break; | 278 | break; |
| @@ -282,16 +284,18 @@ public class YlbServiceImpl extends BaseServiceImpl<Ylb,Integer> implements YlbS | @@ -282,16 +284,18 @@ public class YlbServiceImpl extends BaseServiceImpl<Ylb,Integer> implements YlbS | ||
| 282 | for (int y = 0; y < clyList.size(); y++) { | 284 | for (int y = 0; y < clyList.size(); y++) { |
| 283 | Cyl cyl = clyList.get(y); | 285 | Cyl cyl = clyList.get(y); |
| 284 | if (map.get("clZbh").toString().equals(cyl.getNbbm())) { | 286 | if (map.get("clZbh").toString().equals(cyl.getNbbm())) { |
| 285 | - if(cyl.getCyl()>=0){ | ||
| 286 | - t.setCzyl(cyl.getCyl()); | ||
| 287 | - fage = false; | ||
| 288 | - break; | ||
| 289 | - }else { | ||
| 290 | - if(cyl.getCxrl()!=null){ | ||
| 291 | - if(cyl.getCxrl()>0){ | ||
| 292 | - t.setCzyl(cyl.getCxrl()); | ||
| 293 | - fage = false; | ||
| 294 | - break; | 287 | + if(cyl!=null){ |
| 288 | + if(cyl.getCyl()>=0){ | ||
| 289 | + t.setCzyl(cyl.getCyl()); | ||
| 290 | + fage = false; | ||
| 291 | + break; | ||
| 292 | + }else { | ||
| 293 | + if(cyl.getCxrl()!=null){ | ||
| 294 | + if(cyl.getCxrl()>0){ | ||
| 295 | + t.setCzyl(cyl.getCxrl()); | ||
| 296 | + fage = false; | ||
| 297 | + break; | ||
| 298 | + } | ||
| 295 | } | 299 | } |
| 296 | } | 300 | } |
| 297 | } | 301 | } |
src/main/resources/static/pages/forms/mould/list.xls
No preview for this file type
src/main/resources/static/pages/forms/mould/listDl.xls
No preview for this file type