油，电导出格式

廖磊
1 parent 19277052
Showing 3 changed files with 18 additions and 14 deletions
src/main/java/com/bsth/service/oil/impl/YlbServiceImpl.java
src/main/resources/static/pages/forms/mould/list.xls
src/main/resources/static/pages/forms/mould/listDl.xls
@@ -135,9 +135,11 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 								Ylb ylb=ylListBe.get(i);
 								if(map.get("clZbh").toString().equals(ylb.getNbbm())){
 									if(ylb.getJzyl()!=null){
-										t.setCzyl(ylb.getJzyl());
-										fage=false;
-										break;
+										if(ylb.getJzyl()>0){
+											t.setCzyl(ylb.getJzyl());
+											fage=false;
+											break;
+										}
 									}
  
 								}
@@ -270,7 +272,7 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 						for (int i = 0; i < ylListBe.size(); i++) {
 							Ylb ylb = ylListBe.get(i);
 							if (map.get("clZbh").toString().equals(ylb.getNbbm())) {
-								if(ylb.getJzyl()>=0){
+								if(ylb.getJzyl()>0){
 									t.setCzyl(ylb.getJzyl());
 									fage = false;
 									break;
@@ -282,16 +284,18 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 							for (int y = 0; y < clyList.size(); y++) {
 								Cyl cyl = clyList.get(y);
 								if (map.get("clZbh").toString().equals(cyl.getNbbm())) {
-									if(cyl.getCyl()>=0){
-										t.setCzyl(cyl.getCyl());
-										fage = false;
-										break;
-									}else {
-										if(cyl.getCxrl()!=null){
-											if(cyl.getCxrl()>0){
-												t.setCzyl(cyl.getCxrl());
-												fage = false;
-												break;
+									if(cyl!=null){
+										if(cyl.getCyl()>=0){
+											t.setCzyl(cyl.getCyl());
+											fage = false;
+											break;
+										}else {
+											if(cyl.getCxrl()!=null){
+												if(cyl.getCxrl()>0){
+													t.setCzyl(cyl.getCxrl());
+													fage = false;
+													break;
+												}
 											}
 										}
 									}