From f6820570cd230b363e75c14653fa78d22c022261 Mon Sep 17 00:00:00 2001
From: lh <1209405678@qq.com>
Date: Fri, 23 Feb 2018 16:53:56 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=BBnull?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../work/tablepoultry/ReportActivity.java     | 31 ++++++++++++++++---
 1 file changed, 26 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/com/qhclh/ytzh/work/tablepoultry/ReportActivity.java b/app/src/main/java/com/qhclh/ytzh/work/tablepoultry/ReportActivity.java
index 3ab07d9..9bb6800 100644
--- a/app/src/main/java/com/qhclh/ytzh/work/tablepoultry/ReportActivity.java
+++ b/app/src/main/java/com/qhclh/ytzh/work/tablepoultry/ReportActivity.java
@@ -96,12 +96,33 @@ public class ReportActivity extends BaseActivity {
                 reportBeanList.clear();
                 for (int i=0;i<rpc.size();i++){
                     buildhouseList.add(new ReportString(rpc.get(i).getLong("House_ID"),""+(i+1)));
+                    String days = "";
+                    if (rpc.get(i).getInt("Days")!=null) {
+                        days = rpc.get(i).getInt("Days") + "";
+                    }
+                    String dies = "";
+                    if (rpc.get(i).getInt("DieNumber")!=null){
+                        dies = rpc.get(i).getInt("DieNumber")+"";
+                    }
+                    String obs = "";
+                    if (rpc.get(i).getInt("Obsolete")!=null){
+                        obs = rpc.get(i).getInt("Obsolete")+"";
+                    }
+                    String water = "";
+                    if (rpc.get(i).getDecimal("WaterIntake")!=null){
+                        water = rpc.get(i).getDecimal("WaterIntake")+"";
+                    }
+
+                    String weight = "";
+                    if (rpc.get(i).getDecimal("Weight")!=null){
+                        weight = rpc.get(i).getDecimal("Weight")+"";
+                    }
                     reportBeanList.add(new ReportBean(rpc.get(i).getLong("House_ID")
-                            ,rpc.get(i).getInt("Days")+""
-                            ,rpc.get(i).getInt("DieNumber")+""
-                            ,rpc.get(i).getInt("Obsolete")+""
-                            ,rpc.get(i).getDecimal("WaterIntake")+""
-                            ,rpc.get(i).getDecimal("Weight")+""
+                            ,days
+                            ,dies
+                            ,obs
+                            ,water
+                            ,weight
                             ,rpc.get(i).getString("House_Name")));
                 }