From 2e0b4fa0fcffa763a7b05d3002fb676efa9d4068 Mon Sep 17 00:00:00 2001
From: lh <1209405678@qq.com>
Date: Mon, 16 Apr 2018 09:06:27 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E5=AD=98=E6=B4=BB=E7=8E=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/java/com/qhclh/ytzh/home/RpcUrl.java        | 1 +
 .../com/qhclh/ytzh/work/tablepoultry/ReportActivity.java | 9 +++++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/qhclh/ytzh/home/RpcUrl.java b/app/src/main/java/com/qhclh/ytzh/home/RpcUrl.java
index 72e8f0c..e2b25e4 100644
--- a/app/src/main/java/com/qhclh/ytzh/home/RpcUrl.java
+++ b/app/src/main/java/com/qhclh/ytzh/home/RpcUrl.java
@@ -99,6 +99,7 @@ public class RpcUrl {
 
     public static String DetailListView ="/MainSystem/B3_ZhongHui/Rpcs/DayProductReportRpc/DetailListView";
     public static String DetailListView_fanhui ="/MainSystem/B3PoultryBreed/BO/DayProduct_Detail";
+    public static String DetailListView_fanhui2 ="/MainSystem/B3_ZhongHui/Rpcs/DetailListViewInfo";
 
     public static String HouseView ="/MainSystem/B3_ZhongHui/Rpcs/DayProductReportRpc/HouseView";
 
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 31c1894..0c93a3b 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
@@ -24,6 +24,7 @@ import org.forks.jsonrpc.JsonRpcResult;
 import org.forks.jsonrpc.RpcFacade;
 import org.forks.jsonrpc.RpcObject;
 
+import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
@@ -130,13 +131,17 @@ public class ReportActivity extends BaseActivity {
                     if (rpc.get(i).getDecimal("Weight")!=null){
                         weight = rpc.get(i).getDecimal("Weight")+"";
                     }
+                    String chunhuolv = "";
+                    if (rpc.get(i).getDecimal("LiveRate")!=null){
+                        chunhuolv = rpc.get(i).getDecimal("LiveRate").multiply(new BigDecimal("100")).stripTrailingZeros().toPlainString() + "%";
+                    }
                     reportBeanList.add(new ReportBean(rpc.get(i).getLong("ID")
                             ,days
                             ,dies
                             ,obs
                             ,water
                             ,weight
-                            ,rpc.get(i).getString("House_Name"),i+10+"%"));
+                            ,rpc.get(i).getString("House_Name"),chunhuolv));
                 }
 
                 lvBuildhousenaneAdapter = new LvBuildhousenaneAdapter(ReportActivity.this,buildhouseList);
@@ -149,7 +154,7 @@ public class ReportActivity extends BaseActivity {
             @Override
             public Object call() throws Exception {
                 JsonRpcResult result = RpcFacade.rpcCall(RpcUrl.DetailListView,bfid,new SimpleDateFormat("yyyy-MM-dd").parse(DateTimeUtil.getYMD(new Date(time))));
-                rpc = result.getRpcObjectList(RpcUrl.DetailListView_fanhui);
+                rpc = result.getRpcObjectList(RpcUrl.DetailListView_fanhui2);
                 return null;
             }
         };