修改仔猪存活率返回结果

huimv-hy-production/huimv.hy.erp.datasource/src/main/java/com/huimv/production/datasource/controller/ErpDataController.java

@@ -91,7 +91,7 @@ public class ErpDataController {
 
     /**
      * @Method      : getStorage
-     * @Description : 获取各种存栏
+     * @Description : 获取各品种及各自存栏
      * @Params      : []
      * @Return      : java.lang.String
      * 
@@ -111,7 +111,7 @@ public class ErpDataController {
 
     /**+
      * @Method      : getPigletInfo
-     * @Description : 获取均产仔数，仔猪存活率
+     * @Description : 获取均产仔数
      * @Params      : []
      * @Return      : java.lang.String
      * 

huimv-hy-production/huimv.hy.erp.datasource/src/main/java/com/huimv/production/datasource/dao/repo/TDeliveryRepo.java

@@ -820,7 +820,6 @@ public interface TDeliveryRepo extends JpaRepository<TDeliveryEntity, String>, J
             "           and tppa.FDay<='2021-03-09' and FPigState=15\n" +
             "              and tppa.HogpendID in ('31025DA4-F9E1-46B8-BF38-5F2FA25E9C07')\n" +
             "           group by tppa.HogpendID,tppa.FDay) tmp_tbl group by tmp_tbl.ZCID )zrjcl on zrjcl.ZCID=tmp_tblcl.ZCID\n" +
-            " left join TOrganizeCell on tmp_tblcl.ZCID=TOrganizeCell.FID\n" +
-            " ")
+            " left join TOrganizeCell on tmp_tblcl.ZCID=TOrganizeCell.FID\n")
     List<Object[]> getPigletSurvivalRate(String startDate, String endDate, String farmID);
 }

huimv-hy-production/huimv.hy.erp.datasource/src/main/java/com/huimv/production/datasource/service/impl/ErpDataServiceImpl.java

@@ -158,8 +158,16 @@ public class ErpDataServiceImpl implements IErpDataService {
             dataJo.put("quantity",quantity);
             resultJa.add(dataJo);
         }
+        // 返回真实结果
+//        return resultJa.toJSONString();
+        //模拟结果
+        JSONArray demoJa = new JSONArray();
+        JSONObject demoJo1 = new JSONObject();
+        JSONObject demoJo2 = new JSONObject();
+        JSONObject demoJo3 = new JSONObject();
+        JSONObject demoJo4 = new JSONObject();
 
-        return resultJa.toJSONString();
+        return demoJa.toJSONString();
     }
 
     /**
@@ -305,8 +313,8 @@ public class ErpDataServiceImpl implements IErpDataService {
         log.info(" 仔猪存活率查询数量:"+fieldList.size());
         JSONArray resultJa = new JSONArray();
         for (Object[] fieldObj : fieldList) {
-            String farm = fieldObj[0].toString();
-            String pigletSurvivalRate = fieldObj[1].toString();
+            String pigletSurvivalRate= fieldObj[1].toString();
+            String farm  = fieldObj[0].toString();
             JSONObject dataJo = new JSONObject();
             dataJo.put("farm",farm);
             dataJo.put("piglet_survival_rate",pigletSurvivalRate);