月度困人故障高发使用单位

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/service/impl/YJDPStatisticsServiceImpl.java

@@ -744,7 +744,7 @@ public class YJDPStatisticsServiceImpl {
             lambda.likeRight(AlertUseUnitStatistics::getSupervisoryUnitOrgCode, orgCode);
         }
         String date = DateUtil.formatDate(DateTimeUtil.addMonths(new Date(), -1), "yyyy-MM");
-        lambda.ge(AlertUseUnitStatistics::getStatisticsDate, date);
+        lambda.eq(AlertUseUnitStatistics::getStatisticsDate, date);
         // 使用单位
         if (!ValidationUtil.isEmpty(detailDto.getCompanyName())){
             lambda.like(AlertUseUnitStatistics::getUseUnit, detailDto.getCompanyName().trim());
@@ -753,15 +753,16 @@ public class YJDPStatisticsServiceImpl {
         if (!ValidationUtil.isEmpty(detailDto.getMaintenanceCompanyName())){
             lambda.like(AlertUseUnitStatistics::getMaintenanceUnit, detailDto.getMaintenanceCompanyName().trim());
         }
-        // 开始时间
-        if (!ValidationUtil.isEmpty(detailDto.getTimeSearchOne().getBeginDate())){
-            lambda.ge(AlertUseUnitStatistics::getStartDate, detailDto.getTimeSearchOne().getBeginDate());
-        }
-        // 结束时间
-        if (!ValidationUtil.isEmpty(detailDto.getTimeSearchOne().getEndDate())){
-            lambda.le(AlertUseUnitStatistics::getEndDate, detailDto.getTimeSearchOne().getEndDate());
+        if(!ValidationUtil.isEmpty(detailDto.getTimeSearchOne())) {
+            // 开始时间
+            if (!ValidationUtil.isEmpty(detailDto.getTimeSearchOne().getBeginDate())) {
+                lambda.ge(AlertUseUnitStatistics::getStartDate, detailDto.getTimeSearchOne().getBeginDate());
+            }
+            // 结束时间
+            if (!ValidationUtil.isEmpty(detailDto.getTimeSearchOne().getEndDate())) {
+                lambda.le(AlertUseUnitStatistics::getEndDate, detailDto.getTimeSearchOne().getEndDate());
+            }
         }
-
         // 设备类型
         if (!ValidationUtil.isEmpty(detailDto.getEquListCode())){
             lambda.le(AlertUseUnitStatistics::getEquipmentClassificationCode, detailDto.getEquListCode());