修改获取均产仔数，仔猪存活率

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

@@ -219,42 +219,42 @@ public interface TDeliveryRepo extends JpaRepository<TDeliveryEntity, String>, J
             "GROUP BY td.HOGPENDID,tdie.csamount, tlose.csamount")
     List<Object[]> getPigletInfo_old(String startDate, String endDate);
 
-
-    @Query(nativeQuery = true,value ="SELECT " +
-            "( SELECT FSHORTNAME FROM dbo.TOrganizeCell WHERE FID = td.HOGPENDID ) AS '猪场'," +
-            "COUNT ( tn.SOWSTRID ) AS '分娩头数'," +
-            "SUM ( tn.FAMOUNTKITTENINT ) AS '产仔总数'," +
+    @Query(nativeQuery = true,value ="SELECT  " +
+            "( SELECT FSHORTNAME FROM dbo.TOrganizeCell WHERE FID = td.HOGPENDID ) AS '猪场', " +
+            "COUNT ( tn.SOWSTRID ) AS '分娩头数', " +
+            "SUM ( tn.FAMOUNTKITTENINT ) AS '产仔总数', " +
             "ISNULL(tdie.csamount,0)+ISNULL(tlose.csamount,0) AS '仔猪死淘数' " +
             "FROM " +
             "dbo.TDelivery td " +
-            "LEFT JOIN dbo.TNewStru7743 tn ON tn.FDeliveryMainStruID = td.FID " +
+            "LEFT JOIN dbo.TNewStru7743 tn ON tn.FDeliveryMainStruID = td.FID  " +
             "LEFT JOIN (SELECT isnull(sum(isnull(FPIGDIECOUNT,0)+isnull(FWEAKPIGDIECOUNT,0)),0) as csamount,PIGHOUSEID FROM TPigdieChild,TPigdie WHERE " +
-            "FPigdieMainStruID = TPigdie.FID " +
-            "AND FDIEDATE BETWEEN ?1 " +
+            "FPigdieMainStruID = TPigdie.FID  " +
+            "AND FDIEDATE BETWEEN ?1  " +
             "AND ?2 " +
             "and FPIGSEX = 3 AND FPIGSTATE = 15 " +
             "GROUP BY " +
             "PIGHOUSEID ) tdie on tdie.PIGHOUSEID = td.HOGPENDID " +
-            "LEFT JOIN (SELECT isnull(ISNULL(sum(TPigLoseChild.FpigLoseCount),0)+ISNULL(sum(TPigLoseChild.FweakPigLoseCount),0),0) as csamount,PIGHOUSEID FROM TPigLoseChild," +
-            "TPigLose " +
+            "LEFT JOIN (SELECT isnull(ISNULL(sum(TPigLoseChild.FpigLoseCount),0)+ISNULL(sum(TPigLoseChild.FweakPigLoseCount),0),0) as csamount,PIGHOUSEID FROM TPigLoseChild, " +
+            "TPigLose  " +
             "WHERE " +
-            "FPigLoseMainStruID = TPigLose.FID " +
-            "AND FPIGLOSEDATE BETWEEN ?1 " +
-            "AND ?2 " +
-            "AND FSEX = 3 " +
+            "FPigLoseMainStruID = TPigLose.FID  " +
+            "AND FPIGLOSEDATE BETWEEN ?1  " +
+            "AND ?2  " +
+            "AND FSEX = 3  " +
             "AND FPIGSTATE = 15 " +
             "GROUP BY " +
             "PIGHOUSEID ) tlose on tlose.PIGHOUSEID = td.HOGPENDID " +
             "WHERE " +
-            "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 ('海盐曙光')) " +
+            "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 ('海盐曙光'))  " +
             "GROUP BY " +
-            "td.HOGPENDID," +
-            "tdie.csamount," +
+            "td.HOGPENDID, " +
+            "tdie.csamount, " +
             "tlose.csamount")
     List<Object[]> getPigletInfo(String startDate, String endDate);
+
     /**
      * @Method      : getMateQuantity
      * @Description : 配种数量