From 63ed6b5c3febb5ad1be1c470cb7f43d9d7a29c1f Mon Sep 17 00:00:00 2001
From: lh <1209405678@qq.com>
Date: Wed, 7 Mar 2018 09:07:54 +0800
Subject: [PATCH] no message

---
 .../qhclh/ytzh/bean/BreedFactoryInfoBean.java | 39 ++++++++++++++-----
 .../index/shangpin/PianquinfosActivity.java   | 17 +++++++-
 2 files changed, 45 insertions(+), 11 deletions(-)

diff --git a/app/src/main/java/com/qhclh/ytzh/bean/BreedFactoryInfoBean.java b/app/src/main/java/com/qhclh/ytzh/bean/BreedFactoryInfoBean.java
index 002c5bd..a987047 100644
--- a/app/src/main/java/com/qhclh/ytzh/bean/BreedFactoryInfoBean.java
+++ b/app/src/main/java/com/qhclh/ytzh/bean/BreedFactoryInfoBean.java
@@ -9,6 +9,36 @@ public class BreedFactoryInfoBean {
     private long ID;
     private boolean Empty;
     private String Contact;
+    private String PlanOutDate;
+    private String PlanInDate;
+
+    @Override
+    public String toString() {
+        return "BreedFactoryInfoBean{" +
+                "Name='" + Name + '\'' +
+                ", ID=" + ID +
+                ", Empty=" + Empty +
+                ", Contact='" + Contact + '\'' +
+                ", PlanOutDate='" + PlanOutDate + '\'' +
+                ", PlanInDate='" + PlanInDate + '\'' +
+                '}';
+    }
+
+    public String getPlanOutDate() {
+        return PlanOutDate;
+    }
+
+    public void setPlanOutDate(String planOutDate) {
+        PlanOutDate = planOutDate;
+    }
+
+    public String getPlanInDate() {
+        return PlanInDate;
+    }
+
+    public void setPlanInDate(String planInDate) {
+        PlanInDate = planInDate;
+    }
 
     public String getName() {
         return Name;
@@ -42,13 +72,4 @@ public class BreedFactoryInfoBean {
         Contact = contact;
     }
 
-    @Override
-    public String toString() {
-        return "BreedFactoryInfoBean{" +
-                "Name='" + Name + '\'' +
-                ", ID=" + ID +
-                ", Empty=" + Empty +
-                ", Contact='" + Contact + '\'' +
-                '}';
-    }
 }
diff --git a/app/src/main/java/com/qhclh/ytzh/index/shangpin/PianquinfosActivity.java b/app/src/main/java/com/qhclh/ytzh/index/shangpin/PianquinfosActivity.java
index 42a1dd3..5c2cb1d 100644
--- a/app/src/main/java/com/qhclh/ytzh/index/shangpin/PianquinfosActivity.java
+++ b/app/src/main/java/com/qhclh/ytzh/index/shangpin/PianquinfosActivity.java
@@ -12,6 +12,7 @@ import com.qhclh.ytzh.base.BaseActivity;
 import com.qhclh.ytzh.bean.BreedFactoryInfoBean;
 import com.qhclh.ytzh.home.RpcUrl;
 import com.qhclh.ytzh.tasks.ViewOnClickTask;
+import com.qhclh.ytzh.utils.DateTimeUtil;
 import com.qhclh.ytzh.work.tablepoultry.ReportActivity;
 
 import org.forks.jsonrpc.JsonRpcResult;
@@ -105,6 +106,12 @@ public class PianquinfosActivity extends BaseActivity {
                         }else {
                             konglanbean.setContact("");
                         }
+
+                        if (rpcObjectList.get(i).getDate("PlanInDate") !=null){
+                            konglanbean.setPlanInDate(DateTimeUtil.getYMD2(rpcObjectList.get(i).getDate("PlanInDate")));
+                        }else {
+                            konglanbean.setPlanInDate("");
+                        }
                         konglanlist.add(konglanbean);
 
                     }else {
@@ -121,6 +128,12 @@ public class PianquinfosActivity extends BaseActivity {
                         }else {
                             cunlanbean.setContact("");
                         }
+
+                        if (rpcObjectList.get(i).getDate("PlanOutDate")!=null){
+                            cunlanbean.setPlanOutDate(DateTimeUtil.getYMD2(rpcObjectList.get(i).getDate("PlanOutDate")));
+                        }else {
+                            cunlanbean.setPlanOutDate("");
+                        }
                         cunlanlist.add(cunlanbean);
                     }
                 }
@@ -142,7 +155,7 @@ public class PianquinfosActivity extends BaseActivity {
                             startActivity(intent);
                         }
                     });
-                    pianqu_name.setText((i+1)+".养殖场:"+cunlanlist.get(i).getName());
+                    pianqu_name.setText((i+1)+".养殖场:"+cunlanlist.get(i).getName()+"(计划出栏:"+cunlanlist.get(i).getPlanOutDate()+")");
                     pianqu_content.setText(cunlanlist.get(i).getContact());
                     ll_cunlan.addView(view);
                 }
@@ -162,7 +175,7 @@ public class PianquinfosActivity extends BaseActivity {
 //                        }
 //                    });
 
-                    pianqu_name.setText((i+1)+".养殖场:"+konglanlist.get(i).getName());
+                    pianqu_name.setText((i+1)+".养殖场:"+konglanlist.get(i).getName()+"(计划上鸡:"+konglanlist.get(i).getPlanInDate()+")");
                     pianqu_content.setText(konglanlist.get(i).getContact());
                     ll_konglan.addView(view);
                 }