1、增加牧场参数

2、增加猪仔存活率controller,service,repo

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

@@ -60,13 +60,13 @@ public class ErpDataController {
      * @Time        : 21:14
      */
     @RequestMapping("/getReEstrusRate")
-    public Result getReEstrusRate(@Param(value="startDate") String startDate,@Param(value="endDate") String endDate,@RequestParam(value = "accessToken",required = true) String accessToken){
+    public Result getReEstrusRate(@Param(value="startDate") String startDate,@Param(value="endDate") String endDate,@RequestParam(value = "accessToken",required = true) String accessToken,@RequestParam(value = "farmName",required = true) String farmName){
         // 验证token
         Result result = tokenUtil.verifyToken(accessToken);
         if(!result.isSuccess()){
             return result;
         }
-        return new Result(ResultCode.SUCCESS,erpDataService.getReEstrusRate(startDate,endDate));
+        return new Result(ResultCode.SUCCESS,erpDataService.getReEstrusRate(startDate,endDate,farmName));
     }
 
     /**
@@ -80,13 +80,13 @@ public class ErpDataController {
      * @Time        : 11:02
      */
     @RequestMapping("/getParturitionRate")
-    public Result getParturitionRate(@Param(value="startDate") String startDate,@Param(value="endDate") String endDate,@RequestParam(value = "accessToken",required = true) String accessToken){
+    public Result getParturitionRate(@Param(value="startDate") String startDate,@Param(value="endDate") String endDate,@RequestParam(value = "accessToken",required = true) String accessToken,@RequestParam(value = "farmName",required = true) String farmName){
         // 验证token
         Result result = tokenUtil.verifyToken(accessToken);
         if(!result.isSuccess()){
             return result;
         }
-        return new Result(ResultCode.SUCCESS,erpDataService.getParturitionRate(startDate,endDate));
+        return new Result(ResultCode.SUCCESS,erpDataService.getParturitionRate(startDate,endDate,farmName));
     }
 
     /**
@@ -100,16 +100,16 @@ public class ErpDataController {
      * @Time        : 11:16
      */
     @RequestMapping("/getStorage")
-    public Result getStorage(@RequestParam(value = "accessToken",required = true) String accessToken){
+    public Result getStorage(@RequestParam(value = "accessToken",required = true) String accessToken,@RequestParam(value = "farmName",required = true) String farmName){
         // 验证token
         Result result = tokenUtil.verifyToken(accessToken);
         if(!result.isSuccess()){
             return result;
         }
-        return new Result(ResultCode.SUCCESS,erpDataService.getStorage());
+        return new Result(ResultCode.SUCCESS,erpDataService.getStorage(farmName));
     }
 
-    /**
+    /**+
      * @Method      : getPigletInfo
      * @Description : 获取均产仔数，仔猪存活率
      * @Params      : []
@@ -120,13 +120,13 @@ public class ErpDataController {
      * @Time        : 11:18
      */
     @RequestMapping("/getPigletInfo")
-    public Result getPigletInfo(@Param(value="startDate") String startDate,@Param(value="endDate") String endDate,@RequestParam(value = "accessToken",required = true) String accessToken){
+    public Result getPigletInfo(@Param(value="startDate") String startDate,@Param(value="endDate") String endDate,@RequestParam(value = "accessToken",required = true) String accessToken,@RequestParam(value = "farmName",required = true) String farmName){
         // 验证token
         Result result = tokenUtil.verifyToken(accessToken);
         if(!result.isSuccess()){
             return result;
         }
-        return new Result(ResultCode.SUCCESS,erpDataService.getPigletInfo(startDate,endDate));
+        return new Result(ResultCode.SUCCESS,erpDataService.getPigletInfo(startDate,endDate,farmName));
     }
 
     /**
@@ -140,13 +140,13 @@ public class ErpDataController {
      * @Time        : 11:35
      */
     @RequestMapping("/getMateQuantity")
-    public Result getMateQuantity(@Param(value="startDate") String startDate,@Param(value="endDate") String endDate,@RequestParam(value = "accessToken",required = true) String accessToken){
+    public Result getMateQuantity(@Param(value="startDate") String startDate,@Param(value="endDate") String endDate,@RequestParam(value = "accessToken",required = true) String accessToken,@RequestParam(value = "farmName",required = true) String farmName){
         // 验证token
         Result result = tokenUtil.verifyToken(accessToken);
         if(!result.isSuccess()){
             return result;
         }
-        return new Result(ResultCode.SUCCESS,erpDataService.getMateQuantity(startDate,endDate));
+        return new Result(ResultCode.SUCCESS,erpDataService.getMateQuantity(startDate,endDate,farmName));
     }
 
     /**
@@ -160,13 +160,13 @@ public class ErpDataController {
      * @Time        : 11:38
      */
     @RequestMapping("/getConceptionRate")
-    public Result getConceptionRate(@Param(value="startDate") String startDate,@Param(value="endDate") String endDate,@RequestParam(value = "accessToken",required = true) String accessToken){
+    public Result getConceptionRate(@Param(value="startDate") String startDate,@Param(value="endDate") String endDate,@RequestParam(value = "accessToken",required = true) String accessToken,@RequestParam(value = "farmName",required = true) String farmName){
         // 验证token
         Result result = tokenUtil.verifyToken(accessToken);
         if(!result.isSuccess()){
             return result;
         }
-        return new Result(ResultCode.SUCCESS,erpDataService.getConceptionRate(startDate,endDate));
+        return new Result(ResultCode.SUCCESS,erpDataService.getConceptionRate(startDate,endDate,farmName));
     }
 
     /**
@@ -180,12 +180,32 @@ public class ErpDataController {
      * @Time        : 11:39
      */
     @RequestMapping("/getAllStorage")
-    public Result getAllStorage(@RequestParam(value = "accessToken",required = true) String accessToken){
+    public Result getAllStorage(@RequestParam(value = "accessToken",required = true) String accessToken,@RequestParam(value = "farmName",required = true) String farmName){
+        // 验证token
+        Result result = tokenUtil.verifyToken(accessToken);
+        if(!result.isSuccess()){
+            return result;
+        }
+        return new Result(ResultCode.SUCCESS,erpDataService.getAllStorage(farmName));
+    }
+
+    /**
+     * @Method      : getPigletSurvivalRate
+     * @Description : 获取仔猪存活率
+     * @Params      : [startDate, endDate, accessToken, farmName]
+     * @Return      : com.huimv.common.result.Result
+     * 
+     * @Author      : ZhuoNing
+     * @Date        : 2021/6/30       
+     * @Time        : 13:27
+     */
+    @RequestMapping("/getPigletSurvivalRate")
+    public Result getPigletSurvivalRate(@Param(value="startDate") String startDate,@Param(value="endDate") String endDate,@RequestParam(value = "accessToken",required = true) String accessToken,@RequestParam(value = "farmName",required = true) String farmName){
         // 验证token
         Result result = tokenUtil.verifyToken(accessToken);
         if(!result.isSuccess()){
             return result;
         }
-        return new Result(ResultCode.SUCCESS,erpDataService.getAllStorage());
+        return new Result(ResultCode.SUCCESS,erpDataService.getPigletSurvivalRate(startDate,endDate,farmName));
     }
 }

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

@@ -99,17 +99,17 @@ public interface TDeliveryRepo extends JpaRepository<TDeliveryEntity, String>, J
                     "from (select " +
                     "TBreeding.HogpendID,TNewStru8094.FBreedD,TNewStru8094.SowStrID,TNewStru8094.FParityInt,count(TNewStru8094.FID) as '配种次数' " +
                     "from TBreeding left join TNewStru8094 on TNewStru8094.FBreedingMainStruID=TBreeding.FID " +
-                    "where TBreeding.FLogStatee in(3,4,6)   and datediff(dd,'2021-2-1', FDateBreed)>=-121 and datediff(dd,'2021-3-9',FDateBreed) <=-121 " +
+                    "where TBreeding.FLogStatee in(3,4,6)   and datediff(dd,?1, FDateBreed)>=-121 and datediff(dd,?2,FDateBreed) <=-121 " +
                     "group by TBreeding.HogpendID,TNewStru8094.FBreedD,TNewStru8094.SowStrID,TNewStru8094.FParityInt " +
                     ") tmp_tblpz " +
                     "left join (select TReturnEstrusewStru.SowStrID,TReturnEstrusewStru.FParityInt from TReturnEstrusewStru " +
                     "left join TReturnEstrus on TReturnEstrusewStru.FReturnEstrusMainStruID=TReturnEstrus.FID " +
-                    "where TReturnEstrus.FLogStatee in(3,4,6)  and datediff(dd,'2021-2-1', TReturnEstrusewStru.FDateBreed)>=-121 and datediff(dd,'2021-3-9',TReturnEstrusewStru.FDateBreed) <=-121 " +
+                    "where TReturnEstrus.FLogStatee in(3,4,6)  and datediff(dd,?1, TReturnEstrusewStru.FDateBreed)>=-121 and datediff(dd,?2,TReturnEstrusewStru.FDateBreed) <=-121 " +
                     ") tmp_tblfm on tmp_tblpz.SowStrID=tmp_tblfm.SowStrID and tmp_tblpz.FParityInt=tmp_tblfm.FParityInt " +
                     "left join TOrganizeCell on tmp_tblpz.HogpendID=TOrganizeCell.FID " +
-                    "where TOrganizeCell.FNAME in('海盐曙光') " +
+                    "where TOrganizeCell.FNAME in(?3) " +
                     "group by TOrganizeCell.FSHORTNAME")
-    List<Object[]> getReEstrusRate(String startDate,String endDate);
+    List<Object[]> getReEstrusRate(String startDate,String endDate,String farmName);
 
     /**
      * @Method      : getParturitionRate
@@ -153,9 +153,9 @@ public interface TDeliveryRepo extends JpaRepository<TDeliveryEntity, String>, J
             " and datediff(dd,?2,TNewStru7743.FDateBreed ) <=-121 " +
             ") tmp_tblfm on tmp_tblpz.SowStrID=tmp_tblfm.SowStrID and tmp_tblpz.FParityInt=tmp_tblfm.FParityInt " +
             "left join TOrganizeCell on tmp_tblpz.HogpendID=TOrganizeCell.FID " +
-            "where TOrganizeCell.FNAME in('海盐曙光') " +
+            "where TOrganizeCell.FNAME in(?3) " +
             "group by TOrganizeCell.FSHORTNAME")
-    List<Object[]> getParturitionRate(String startDate, String endDate);
+    List<Object[]> getParturitionRate(String startDate, String endDate,String farmName);
     
     /**
      * @Method      : getStorage
@@ -172,10 +172,10 @@ public interface TDeliveryRepo extends JpaRepository<TDeliveryEntity, String>, J
             "RIGHT JOIN TBreed tb ON tb.FID = tp.VARIETYDID GROUP BY oc.FSHORTNAME,tb.FNAME ")
     List<Object[]> getStorage_old();
 
-    @Query(nativeQuery = true,value ="SELECT oc.FSHORTNAME,tb.FNAME,COUNT(tp.FID) FROM (select TOrganizeCell.FID,TOrganizeCell.FSHORTNAME from  TOrganizeCell where FNAME in ('海盐曙光')) oc left " +
+    @Query(nativeQuery = true,value ="SELECT oc.FSHORTNAME,tb.FNAME,COUNT(tp.FID) FROM (select TOrganizeCell.FID,TOrganizeCell.FSHORTNAME from  TOrganizeCell where FNAME in (?1)) oc left " +
             "JOIN TPigArchives tp ON tp.HOGPENWHEREDID = oc.FID " +
             "left JOIN TBreed tb ON tb.FID = tp.VARIETYDID GROUP BY oc.FSHORTNAME,tb.FNAME")
-    List<Object[]> getStorage();
+    List<Object[]> getStorage(String farmName);
 
     /**
      * @Method      : getPigletInfo
@@ -248,12 +248,12 @@ public interface TDeliveryRepo extends JpaRepository<TDeliveryEntity, String>, J
             "td.FLOGSTATEE IN ( 3, 4, 6 )  " +
             "AND datediff( dd, ?1, td.FDATEDELIVERY ) >= 0  " +
             "AND datediff( dd, ?2, td.FDATEDELIVERY ) <= 0  " +
-            "AND td.HOGPENDID IN (select FID from TOrganizeCell where FNAME in ('海盐曙光'))  " +
+            "AND td.HOGPENDID IN (select FID from TOrganizeCell where FNAME in (?3))  " +
             "GROUP BY " +
             "td.HOGPENDID, " +
             "tdie.csamount, " +
             "tlose.csamount")
-    List<Object[]> getPigletInfo(String startDate, String endDate);
+    List<Object[]> getPigletInfo(String startDate, String endDate,String farmName);
 
     /**
      * @Method      : getMateQuantity
@@ -281,9 +281,9 @@ public interface TDeliveryRepo extends JpaRepository<TDeliveryEntity, String>, J
             "where TBreeding.FLogStatee in(3,4,6)  and datediff(dd,?1, FDateBreed)>=0 and datediff(dd,?2,FDateBreed) <=0 " +
             "group by TBreeding.HogpendID,TNewStru8094.FBreedD,TNewStru8094.SowStrID,TNewStru8094.FParityInt " +
             ") tmp_tblpzts  left join TOrganizeCell on tmp_tblpzts.HogpendID=TOrganizeCell.FID " +
-            "where  TOrganizeCell.FNAME in('海盐曙光') " +
+            "where  TOrganizeCell.FNAME in(?3) " +
             "group by TOrganizeCell.FSHORTNAME,tmp_tblpzts.FBREEDD")
-    List<Object[]> getMateQuantity(String startDate, String endDate);
+    List<Object[]> getMateQuantity(String startDate, String endDate,String farmName);
 
     /**
      * @Method      : getConceptionRate
@@ -359,8 +359,8 @@ public interface TDeliveryRepo extends JpaRepository<TDeliveryEntity, String>, J
             " ) tmp_tblfm on tmp_tblpz.SowStrID=tmp_tblfm.SowStrID and tmp_tblpz.FParityInt=tmp_tblfm.FParityInt " +
             " group by tmp_tblpz.HogpendID) tmp_tblpzlc on tmp_tblpzlc.ZCID=tmp_tblpz.ZCID " +
             " left join TOrganizeCell on tmp_tblpz.ZCID=TOrganizeCell.FID " +
-            " where TOrganizeCell.FNAME in('海盐曙光')")
-    List<Object[]> getConceptionRate(String startDate, String endDate);
+            " where TOrganizeCell.FNAME in(?3)")
+    List<Object[]> getConceptionRate(String startDate, String endDate,String farmName);
 
 
     /**
@@ -516,8 +516,170 @@ public interface TDeliveryRepo extends JpaRepository<TDeliveryEntity, String>, J
             ") tblz_tmp " +
             "GROUP BY " +
             "tblz_tmp.FNAME " +
-            ") AS tbls_tmp ON tbls_tmp.NAME = H.fid where H.FNAME in('海盐曙光') " +
+            ") AS tbls_tmp ON tbls_tmp.NAME = H.fid where H.FNAME in(?1) " +
             "ORDER BY " +
             "H.FNAME")
-    List<Object[]> getAllStorage();
+    List<Object[]> getAllStorage(String farmName);
+
+    /**
+     * @Method      : getPigletSurvivalRate
+     * @Description : 猪仔存活率
+     * @Params      : [startDate, endDate, farmName]
+     * @Return      : java.util.List<java.lang.Object[]>
+     * 
+     * @Author      : ZhuoNing
+     * @Date        : 2021/6/30       
+     * @Time        : 13:31
+     */
+    @Query(nativeQuery = true,value ="SELECT  " +
+            "TOrganizeCell.FSHORTNAME AS 猪场, " +
+            "CAST " +
+            "(( " +
+            "CASE " +
+            "WHEN isnull( zrjcl.RJAmount, 0 ) > 0 THEN " +
+            "1- ( " +
+            "isnull( die.教槽, 0 ) + isnull( lose.教槽, 0 )) / isnull( zrjcl.RJAmount, 0 ) ELSE 0  " +
+            "END  " +
+            ") * 100 AS DEC ( 10, 2 )) 产房存活率 " +
+            "FROM " +
+            "TOrganizeCell " +
+            "LEFT JOIN ( " +
+            "SELECT " +
+            "tmpScbd.zsmc AS 'ZCID', " +
+            "( " +
+            "SUM ( tmpScbd.zzsl ) / ( DATEDIFF( dd,?1 ,?2 ) + 1 )) AS 'RJAmount'  " +
+            "FROM " +
+            "tmpScbd  " +
+            "GROUP BY " +
+            "tmpScbd.zsmc  " +
+            ") zrjcl ON zrjcl.ZCID= TOrganizeCell.FID " +
+            "LEFT JOIN ( " +
+            "SELECT " +
+            "tmpby.zsmc AS 'ZCID', " +
+            "( " +
+            "SUM ( tmpby.zzsl ) / ( DATEDIFF( dd,?1 ,?2 ) + 1 )) AS 'RJAmount'  " +
+            "FROM " +
+            "tmpby  " +
+            "GROUP BY " +
+            "tmpby.zsmc  " +
+            ") byrjcl ON byrjcl.ZCID= TOrganizeCell.FID " +
+            "LEFT JOIN ( " +
+            "SELECT " +
+            "tmpyf.zsmc AS 'ZCID', " +
+            "( " +
+            "SUM ( tmpyf.zzsl ) / ( DATEDIFF( dd,?1 ,?2 ) + 1 )) AS 'RJAmount'  " +
+            "FROM " +
+            "tmpyf  " +
+            "GROUP BY " +
+            "tmpyf.zsmc  " +
+            ") yfrjcl ON yfrjcl.ZCID= TOrganizeCell.FID " +
+            "LEFT JOIN ( " +
+            "SELECT " +
+            "temp.PigHouseID, " +
+            "SUM ( " +
+            "isnull( temp.育肥, 0 )) AS 育肥, " +
+            "SUM ( " +
+            "isnull( temp.教槽, 0 )) AS 教槽, " +
+            "SUM ( " +
+            "isnull( temp.保育, 0 )) AS 保育  " +
+            "FROM " +
+            "( " +
+            "SELECT " +
+            "TPigDie.PigHouseID  , " +
+            "CASE " +
+            "WHEN TPigDieChild.FPigState IN ( 1, 21, 22, 16 )  " +
+            "AND TPigDieChild.FPigSex IN ( 1, 2, 3 ) THEN " +
+            "SUM ( TPigDieChild.FweakpigdieCount ) + SUM ( TPigDieChild.Fpigdiecount )  " +
+            "END '育肥', " +
+            "CASE " +
+            "WHEN TPigDieChild.FPigState IN ( 15 )  " +
+            "AND TPigDieChild.FPigSex IN ( 1, 2, 3 ) THEN " +
+            "SUM ( TPigDieChild.FweakpigdieCount ) + SUM ( TPigDieChild.Fpigdiecount )  " +
+            "END '教槽', " +
+            "CASE " +
+            "WHEN TPigDieChild.FPigState IN ( 14 )  " +
+            "AND TPigDieChild.FPigSex IN ( 1, 2, 3 ) THEN " +
+            "SUM ( TPigDieChild.FweakpigdieCount ) + SUM ( TPigDieChild.Fpigdiecount )  " +
+            "END '保育', " +
+            "CASE " +
+            "WHEN TPigDieChild.FPigState IN ( 11 )  " +
+            "AND TPigDieChild.FPigSex= 3 THEN " +
+            "SUM ( TPigDieChild.FweakpigdieCount ) + SUM ( TPigDieChild.Fpigdiecount )  " +
+            "END '后备'  " +
+            "FROM " +
+            "TPigDie " +
+            "LEFT JOIN TPigDieChild ON TPigDieChild.FPigDieMainStruID= TPigDie.FID  " +
+            "WHERE " +
+            "TPigDie.FBillState IN ( 3, 4, 6 )  " +
+            "AND TPigDieChild.FPigSex IN ( 1, 2, 3 )  " +
+            "AND FPIGSTATE IN ( 14, 15, 1, 21, 22, 11, 16 )  " +
+            "AND datediff( dd,?1 , TPigDie.FDieDate ) >= 0  " +
+            "AND datediff( dd,  ?2, TPigDie.FDieDate ) <= 0  " +
+            "GROUP BY " +
+            "TPigDieChild.FPigState, " +
+            "TPigDieChild.FPigSex , " +
+            "TPigDie.PigHouseID  " +
+            ") temp  " +
+            "GROUP BY " +
+            "temp.PigHouseID  " +
+            ") die ON die.PigHouseID= TOrganizeCell.FID " +
+            "LEFT JOIN ( " +
+            "SELECT " +
+            "temp.PigHouseID, " +
+            "SUM ( " +
+            "isnull( temp.育肥, 0 )) AS 育肥, " +
+            "SUM ( " +
+            "isnull( temp.教槽, 0 )) AS 教槽, " +
+            "SUM ( " +
+            "isnull( temp.保育, 0 )) AS 保育  " +
+            "FROM " +
+            "( " +
+            "SELECT " +
+            "TPigLose.PigHouseID  , " +
+            "CASE " +
+            "WHEN TPigLoseChild.FPigState IN ( 1, 21, 22, 16 )  " +
+            "AND TPigLoseChild.FSEX IN ( 1, 2, 3 ) THEN " +
+            "SUM ( TPigLoseChild.FpigLoseCount ) + SUM ( TPigLoseChild.FweakPigLoseCount )  " +
+            "END '育肥', " +
+            "CASE " +
+            "WHEN TPigLoseChild.FPigState IN ( 15 )  " +
+            "AND TPigLoseChild.FSEX IN ( 1, 2, 3 ) THEN " +
+            "SUM ( TPigLoseChild.FpigLoseCount ) + SUM ( TPigLoseChild.FweakPigLoseCount )  " +
+            "END '教槽', " +
+            "CASE " +
+            "WHEN TPigLoseChild.FPigState IN ( 14 )  " +
+            "AND TPigLoseChild.FSEX IN ( 1, 2, 3 ) THEN " +
+            "SUM ( TPigLoseChild.FpigLoseCount ) + SUM ( TPigLoseChild.FweakPigLoseCount )  " +
+            "END '保育', " +
+            "CASE " +
+            "WHEN TPigLoseChild.FPigState IN ( 11 )  " +
+            "AND TPigLoseChild.FSEX= 3 THEN " +
+            "SUM ( TPigLoseChild.FpigLoseCount ) + SUM ( TPigLoseChild.FweakPigLoseCount )  " +
+            "END '后备'  " +
+            "FROM " +
+            "TPigLose " +
+            "LEFT JOIN TPigLoseChild ON TPigLoseChild.FPigLoseMainStruID= TPigLose.FID  " +
+            "WHERE " +
+            "TPigLose.FBillState IN ( 3, 4, 6 )  " +
+            "AND TPigLoseChild.FSEX IN ( 1, 2, 3 )  " +
+            "AND FPIGSTATE IN ( 14, 15, 1, 21, 22, 11, 16 )  " +
+            "AND datediff( dd,?1 , TPigLose.Fpiglosedate ) >= 0  " +
+            "AND datediff( dd,  ?2, TPigLose.Fpiglosedate ) <= 0  " +
+            "GROUP BY " +
+            "TPigLoseChild.FPigState, " +
+            "TPigLoseChild.FSEX , " +
+            "TPigLose.PigHouseID  " +
+            ") temp  " +
+            "GROUP BY " +
+            "temp.PigHouseID  " +
+            ") lose ON lose.PigHouseID= TOrganizeCell.FID  " +
+            "WHERE " +
+            "FOrganizeType = 2  " +
+            "AND ( TOrganizeCell.FNAME in(?3) )  " +
+            "AND ( " +
+            "isnull( zrjcl.RJAmount, 0 ) != 0  " +
+            "OR isnull( byrjcl.RJAmount, 0 ) != 0  " +
+            "OR isnull( yfrjcl.RJAmount, 0 ) != 0  " +
+            ")")
+    List<Object[]> getPigletSurvivalRate(String startDate, String endDate, String farmName);
 }

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

@@ -4,17 +4,19 @@ public interface IErpDataService {
 
     String getPsy(String startDate,String endDate);
 
-    String getReEstrusRate(String startDate,String endDate);
+    String getReEstrusRate(String startDate,String endDate,String farmName);
 
-    String getParturitionRate(String startDate,String endDate);
+    String getParturitionRate(String startDate,String endDate,String farmName);
 
-    String getStorage();
+    String getStorage(String farmName);
 
-    String getPigletInfo(String startDate,String endDate);
+    String getPigletInfo(String startDate,String endDate,String farmName);
 
-    String getMateQuantity(String startDate, String endDate);
+    String getMateQuantity(String startDate, String endDate,String farmName);
 
-    String getConceptionRate(String startDate, String endDate);
+    String getConceptionRate(String startDate, String endDate,String farmName);
 
-    String getAllStorage();
+    String getAllStorage(String farmName);
+
+    Object getPigletSurvivalRate(String startDate, String endDate, String farmName);
 }

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

@@ -22,7 +22,7 @@ import java.util.List;
 @Slf4j
 public class ErpDataServiceImpl implements IErpDataService {
 //    private String testFarm = "油车港";
-    private String testFarm = "海盐";
+//    private String testFarm = "海盐";
     @Autowired
     private TDeliveryRepo tDeliveryRepo;
 
@@ -61,10 +61,11 @@ public class ErpDataServiceImpl implements IErpDataService {
      * @Time        : 11:41
      */
     @Override
-    public String getReEstrusRate(String startDate,String endDate) {
+    public String getReEstrusRate(String startDate,String endDate,String farmName) {
         log.info(" 开始日期（返情率） startDate:"+startDate);
         log.info(" 结束日期（返情率） endDate:"+endDate);
-        List<Object[]> reEstrusRateFieldList = tDeliveryRepo.getReEstrusRate(startDate,endDate);
+        log.info(" 牧场名称（返情率） farmName:"+farmName);
+        List<Object[]> reEstrusRateFieldList = tDeliveryRepo.getReEstrusRate(startDate,endDate,farmName);
         log.info(" 返情率查询数量:"+reEstrusRateFieldList.size());
         JSONArray resultJa = new JSONArray();
         for (Object[] fieldObj : reEstrusRateFieldList) {
@@ -92,10 +93,11 @@ public class ErpDataServiceImpl implements IErpDataService {
      * @Time        : 11:41
      */
     @Override
-    public String getParturitionRate(String startDate,String endDate) {
+    public String getParturitionRate(String startDate,String endDate,String farmName) {
         log.info(" 开始日期（分娩率） startDate:"+startDate);
         log.info(" 结束日期（分娩率） endDate:"+endDate);
-        List<Object[]> fieldList = tDeliveryRepo.getParturitionRate(startDate,endDate);
+        log.info(" 牧场名称（分娩率） farmName:"+farmName);
+        List<Object[]> fieldList = tDeliveryRepo.getParturitionRate(startDate,endDate,farmName);
         log.info(" 分娩率查询数量:"+fieldList.size());
         JSONArray resultJa = new JSONArray();
         for (Object[] fieldObj : fieldList) {
@@ -113,7 +115,7 @@ public class ErpDataServiceImpl implements IErpDataService {
 
     /**
      * @Method      : getStorage
-     * @Description : 各种存栏
+     * @Description : 各品种及各自存栏
      * @Params      : []
      * @Return      : java.lang.String
      * 
@@ -122,8 +124,9 @@ public class ErpDataServiceImpl implements IErpDataService {
      * @Time        : 11:42
      */
     @Override
-    public String getStorage() {
-        List<Object[]> fieldList = tDeliveryRepo.getStorage();
+    public String getStorage(String farmName) {
+        log.info(" 牧场名称（各品种及各自存栏） farmName:"+farmName);
+        List<Object[]> fieldList = tDeliveryRepo.getStorage(farmName);
         log.info(" 各种存栏查询数量:"+fieldList.size());
         JSONArray resultJa = new JSONArray();
         for (Object[] fieldObj : fieldList) {
@@ -170,10 +173,11 @@ public class ErpDataServiceImpl implements IErpDataService {
      * @Time        : 11:43
      */
     @Override
-    public String getPigletInfo(String startDate,String endDate) {
+    public String getPigletInfo(String startDate,String endDate,String farmName) {
         log.info(" 开始日期（均产仔数，仔猪存活率） startDate:"+startDate);
         log.info(" 结束日期（均产仔数，仔猪存活率） endDate:"+endDate);
-        List<Object[]> fieldList = tDeliveryRepo.getPigletInfo(startDate,endDate);
+        log.info(" 牧场名称（均产仔数，仔猪存活率） farmName:"+farmName);
+        List<Object[]> fieldList = tDeliveryRepo.getPigletInfo(startDate,endDate,farmName);
         log.info(" 均产仔数，仔猪存活率查询数量:"+fieldList.size());
         JSONArray resultJa = new JSONArray();
         for (Object[] fieldObj : fieldList) {
@@ -203,10 +207,11 @@ public class ErpDataServiceImpl implements IErpDataService {
      * @Time        : 11:44
      */
     @Override
-    public String getMateQuantity(String startDate, String endDate) {
+    public String getMateQuantity(String startDate, String endDate,String farmName) {
         log.info(" 开始日期（配种数量） startDate:"+startDate);
         log.info(" 结束日期（配种数量） endDate:"+endDate);
-        List<Object[]> fieldList = tDeliveryRepo.getMateQuantity(startDate,endDate);
+        log.info(" 牧场名称（配种数量） farmName:"+farmName);
+        List<Object[]> fieldList = tDeliveryRepo.getMateQuantity(startDate,endDate,farmName);
         log.info(" 配种查询数量:"+fieldList.size());
         JSONArray resultJa = new JSONArray();
         for (Object[] fieldObj : fieldList) {
@@ -234,10 +239,11 @@ public class ErpDataServiceImpl implements IErpDataService {
      * @Time        : 11:45
      */
     @Override
-    public String getConceptionRate(String startDate, String endDate) {
+    public String getConceptionRate(String startDate, String endDate,String farmName) {
         log.info(" 开始日期（受胎率） startDate:"+startDate);
         log.info(" 结束日期（受胎率） endDate:"+endDate);
-        List<Object[]> fieldList = tDeliveryRepo.getConceptionRate(startDate,endDate);
+        log.info(" 牧场名称（受胎率） farmName:"+farmName);
+        List<Object[]> fieldList = tDeliveryRepo.getConceptionRate(startDate,endDate,farmName);
         log.info(" 受胎率查询数量:"+fieldList.size());
         JSONArray resultJa = new JSONArray();
         for (Object[] fieldObj : fieldList) {
@@ -248,7 +254,6 @@ public class ErpDataServiceImpl implements IErpDataService {
             dataJo.put("conception_rate",conception_rate);
             resultJa.add(dataJo);
         }
-
         return resultJa.toJSONString();
     }
 
@@ -263,8 +268,9 @@ public class ErpDataServiceImpl implements IErpDataService {
      * @Time        : 11:45
      */
     @Override
-    public String getAllStorage() {
-        List<Object[]> fieldList = tDeliveryRepo.getAllStorage();
+    public String getAllStorage(String farmName) {
+        log.info(" 牧场名称（总存栏，母猪存栏） farmName:"+farmName);
+        List<Object[]> fieldList = tDeliveryRepo.getAllStorage(farmName);
         log.info(" 总存栏，母猪存栏查询数量:"+fieldList.size());
         JSONArray resultJa = new JSONArray();
         for (Object[] fieldObj : fieldList) {
@@ -279,4 +285,33 @@ public class ErpDataServiceImpl implements IErpDataService {
         }
         return resultJa.toJSONString();
     }
+
+    /**
+     * @Method      : getPigletSurvivalRate
+     * @Description : 仔猪存活率
+     * @Params      : [startDate, endDate, farmName]
+     * @Return      : java.lang.Object
+     * 
+     * @Author      : ZhuoNing
+     * @Date        : 2021/6/30       
+     * @Time        : 13:28
+     */
+    @Override
+    public Object getPigletSurvivalRate(String startDate, String endDate, String farmName) {
+        log.info(" 开始日期（仔猪存活率） startDate:"+startDate);
+        log.info(" 结束日期（仔猪存活率） endDate:"+endDate);
+        log.info(" 牧场名称（仔猪存活率） farmName:"+farmName);
+        List<Object[]> fieldList = tDeliveryRepo.getPigletSurvivalRate(startDate,endDate,farmName);
+        log.info(" 仔猪存活率查询数量:"+fieldList.size());
+        JSONArray resultJa = new JSONArray();
+        for (Object[] fieldObj : fieldList) {
+            String farm = fieldObj[0].toString();
+            String pigletSurvivalRate = fieldObj[1].toString();
+            JSONObject dataJo = new JSONObject();
+            dataJo.put("farm",farm);
+            dataJo.put("piglet_survival_rate",pigletSurvivalRate);
+            resultJa.add(dataJo);
+        }
+        return resultJa.toJSONString();
+    }
 }