Browse Source

能源成本中心查询过滤查询状态

huangpeng 1 year ago
parent
commit
44aa934e87

+ 8 - 3
cx-equipment/cx-equipment-common/src/main/java/com/rongwei/bscommon/sys/dao/EquEnergyMeterCenterDosageDayDao.java

@@ -17,13 +17,17 @@ public interface EquEnergyMeterCenterDosageDayDao extends BaseMapper<EquEnergyMe
             "\tUUID() AS 'ID',\n" +
             "\tb.CENTERID,\n" +
             "\tb.CENTERDAY,\n" +
-            "\tb.DOSAGE ,b.TENANTID,b.OWNEDFACTORY\n" +
+            "\tb.DOSAGE,\n" +
+            "\tb.TENANTID,\n" +
+            "\tb.OWNEDFACTORY \n" +
             "FROM\n" +
             "\tequ_energy_meter_center a\n" +
             "\tLEFT JOIN (\n" +
             "\tSELECT\n" +
             "\t\ta.CENTERID,\n" +
-            "\t\tb.CENTERDAY,b.TENANTID,b.OWNEDFACTORY,\n" +
+            "\t\tb.CENTERDAY,\n" +
+            "\t\tb.TENANTID,\n" +
+            "\t\tb.OWNEDFACTORY,\n" +
             "\t\tSUM(\n" +
             "\t\tCASE\n" +
             "\t\t\t\t\n" +
@@ -43,6 +47,7 @@ public interface EquEnergyMeterCenterDosageDayDao extends BaseMapper<EquEnergyMe
             "\t\t\tb.CENTERDAY \n" +
             "\t\t) b ON a.ID = b.CENTERID \n" +
             "WHERE\n" +
-            "\tb.CENTERDAY IS NOT NULL")
+            "\tb.CENTERDAY IS NOT NULL and\n" +
+            "\ta.`STATUS`='enable' and a.DELETED='0'")
     List<EquEnergyMeterCenterDosageDayDo> calRecordDataToCenterDosageDay();
 }