1

src/main/java/com/chinaitop/agile/model/DataKcglKcswDefault.java

@@ -333,17 +333,17 @@ public class DataKcglKcswDefault {
         this.cjsj = cjsj;
     }
     
-    private int scnf; //生产年份
+    private Integer scnf; //生产年份
     
     private double rksl; //已验收数量
     
     private double wyssl; //未验收数量
 
-	public int getScnf() {
+	public Integer getScnf() {
 		return scnf;
 	}
 
-	public void setScnf(int scnf) {
+	public void setScnf(Integer scnf) {
 		this.scnf = scnf;
 	}
 

src/main/java/com/chinaitop/agile/service/impl/KcswServiceImpl.java

@@ -378,11 +378,17 @@ public class KcswServiceImpl implements KcswService{
     	if(list.size()>0 && list!=null){
     		 pz = Integer.parseInt(list.get(0).getPz());
     		 mxpz = Integer.parseInt(list.get(0).getMxpz());
-    		 dj = Integer.parseInt(list.get(0).getDj());
     		 hwxz = Integer.parseInt(list.get(0).getHwxz());
-    		 gb = Integer.parseInt(list.get(0).getGb());
+    		 if (StringUtils.isNotBlank(list.get(0).getDj())) {
+    			 dj = Integer.parseInt(list.get(0).getDj());
+    		 }
+    		 if (StringUtils.isNotBlank(list.get(0).getGb())) {
+    			 gb = Integer.parseInt(list.get(0).getGb());
+    		 }
+    		 if (null != list.get(0).getScnf()) {
+    			 scnf = list.get(0).getScnf();
+    		 }
     		 rq = ParameterUtil.datetime2string(list.get(0).getRq());
-    		 scnf = list.get(0).getScnf();
     		 kcsl = list.get(0).getKcsl();
     	}
     	modelMap.put("pz", pz);