华高

mjava-huagao/src/main/java/com/malk/huagao/service/impl/EqbServiceImpl.java

@@ -426,12 +426,12 @@ public class EqbServiceImpl implements EqbService {
             String xssl = UtilMap.getString(xshtmxList.get(i), "numberField_mfbx1pr4");//销售数量
             double lsdj = UtilMap.getDouble(xshtmxList.get(i), "numberField_mf50cbri");//零售单价
             double pfyhdj = UtilMap.getDouble(xshtmxList.get(i), "numberField_mf50cbrj");//批发优惠单价
-            String zbq = UtilMap.getString(xshtmxList.get(i), "textField_mjas1rkx");//质保期
-
+            int zbq = UtilMap.getInt(xshtmxList.get(i), "numberField_mjb71qay");//质保期
+            String zbqValue = zbq > 0 ? zbq + "年" : "";
             if (i == 0){
-                xshtmx.add(getRowMap(false,i+1,cpmc,cpxh,dw,lsdj,pfyhdj,zbq));
+                xshtmx.add(getRowMap(false,i+1,cpmc,cpxh,dw,lsdj,pfyhdj,zbqValue));
             }else {
-                xshtmx.add(getRowMap(true,i+1,cpmc,cpxh,dw,lsdj,pfyhdj,zbq));
+                xshtmx.add(getRowMap(true,i+1,cpmc,cpxh,dw,lsdj,pfyhdj,zbqValue));
             }
         }
         Map jxsComponent16 = new HashMap();
@@ -558,10 +558,11 @@ public class EqbServiceImpl implements EqbService {
             double zke = UtilMap.getDouble(xshtmxList.get(i), "numberField_mjb71qao");//折扣额
             String bz = UtilMap.getString(xshtmxList.get(i), "textField_mjb71qaq");//备注
 
+            String zbqValue = zbq > 0 ? zbq + "年" : "";
             if (i == 0){
-                xshtmx.add(getRowMap(false,cpmc,cpxh,dw,xssl,hsdj,zbq+"年",smzs,jshj,zke,bz));
+                xshtmx.add(getRowMap(false,cpmc,cpxh,dw,xssl,hsdj,zbqValue,smzs,jshj,zke,bz));
             }else {
-                xshtmx.add(getRowMap(true,cpmc,cpxh,dw,xssl,hsdj,zbq+"年",smzs,jshj,zke,bz));
+                xshtmx.add(getRowMap(true,cpmc,cpxh,dw,xssl,hsdj,zbqValue,smzs,jshj,zke,bz));
             }
         }
         Map jxsComponent9 = new HashMap();