综合监管 不按照入库的砂石进行统计

backend/inz.common/src/main/java/com/beecode/inz/common/util/DateTimeUtils.java

@@ -153,6 +153,18 @@ public class DateTimeUtils {
         return getDaysCountDiffTwoLocalDateTime(dateToLocalDateTime(from), dateToLocalDateTime(to));
     }
 
+    /**获取一个月天数(一个月最多多少天)
+     *
+     * @param date
+     * @return
+     */
+    public static int getDaysOfMonth(Date date) {
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(date);
+        return calendar.getActualMaximum(Calendar.DAY_OF_MONTH);
+    }
+
+
     /**
      * date 转换成 LocalDateTime
      *

backend/xyst.dinas.statistics/src/main/resources/com/xyst/dinas/statistics/advanquery/DinasTypeProductionStatisticsAdvQuery.jmx

@@ -20,7 +20,6 @@
                 LEFT JOIN ProductionPlanReportAssociateddinasTypeDetail as dtd on dtd.master = ppr.id
                 LEFT JOIN DinasType as bdt on bdt.id = dtd.dinasType
                 where (dbo.discard = 0 or dbo.discard is null)
-                and ppr.warehousingStatus = 1
                 and ppr.productionPlanDate >= :?startDate
                 and Ppr.productionPlanDate <= :?endDate
                 GROUP BY bdt.id

backend/xyst.dinas.statistics/src/main/resources/com/xyst/dinas/statistics/advanquery/RegionalCompanyProductionStatisticsAdvQuery.jmx

@@ -18,7 +18,6 @@
                 LEFT JOIN ProductionPlanReport AS ppr ON ppr.regionalCompany = dbo.id
                 LEFT JOIN ProductionPlanReportAssociateddinasTypeDetail as dtd on dtd.master = ppr.id
                 where (dbo.discard = 0 or dbo.discard is null)
-                and ppr.warehousingStatus = 1
                 and ppr.productionPlanDate >= :?startDate
                 and ppr.productionPlanDate <= :?endDate
                 GROUP BY dbo.id