Browse Source

修改bug

523096025 2 years ago
parent
commit
b95392fa13

+ 1 - 0
huimv-cattle/src/main/java/com/huimv/cattle/controller/OverviewController.java

@@ -152,6 +152,7 @@ public class OverviewController {
             System.out.println(body);
             JSONObject dataJo = JSON.parseObject(body).getJSONObject("data");
             System.out.println("dataJo="+dataJo);
+            dataJo.put("variety",0);
             //, )
             return new Result(ResultCode.SUCCESS,dataJo);
         }else{

+ 2 - 2
huimv-cattle/src/main/java/com/huimv/cattle/service/impl/StockServiceImpl.java

@@ -204,8 +204,8 @@ public class StockServiceImpl extends ServiceImpl<StockMapper, Stock> implements
             //根据乡镇读取填报存栏数据
             JSONObject stockJo = getStockByTown(townJo);
             townJo.put("fatStock", stockJo.getString("fatStock"));
-            townJo.put("cowStock", stockJo.getString("cowStock"));
-            townJo.put("bullStock", stockJo.getString("bullStock"));
+            townJo.put("sowStock", stockJo.getString("cowStock"));
+            townJo.put("boarStock", stockJo.getString("bullStock"));
             townJo.put("totalStock", stockJo.getString("totalStock"));
             //根据乡镇读取填报出栏数据
             Integer outStock = overviewService.getOutStock(townJo);