sql 查询，逻辑删除添加

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

@@ -30,7 +30,6 @@ public interface EquEnergyMeterCenterDosageDayDao extends BaseMapper<EquEnergyMe
             "\t\tb.OWNEDFACTORY,\n" +
             "\t\tSUM(\n" +
             "\t\tCASE\n" +
-            "\t\t\t\t\n" +
             "\t\t\t\tWHEN b.DOSAGE IS NULL THEN\n" +
             "\t\t\tNULL \n" +
             "\t\t\t\tWHEN a.JSMETHOD = '+' THEN\n" +
@@ -42,12 +41,14 @@ public interface EquEnergyMeterCenterDosageDayDao extends BaseMapper<EquEnergyMe
             "\t\tFROM\n" +
             "\t\t\tequ_energy_meter_center_detail a\n" +
             "\t\t\tINNER JOIN equ_energy_meter_dosage_day b ON a.METERID = b.METERID \n" +
+            "\t\t \tWHERE a.DELETED='0'\n" +
             "\t\tGROUP BY\n" +
             "\t\t\ta.CENTERID,\n" +
             "\t\t\tb.CENTERDAY \n" +
             "\t\t) b ON a.ID = b.CENTERID \n" +
             "WHERE\n" +
-            "\tb.CENTERDAY IS NOT NULL and\n" +
+            "\tb.CENTERDAY IS NOT NULL\n" +
+            "\tand\n" +
             "\ta.`STATUS`='enable' and a.DELETED='0'")
     List<EquEnergyMeterCenterDosageDayDo> calRecordDataToCenterDosageDay();
 }

cx-equipment/cx-equipment-common/src/main/java/com/rongwei/bscommon/sys/dao/EquEnergyRecordDao.java

@@ -28,7 +28,7 @@ public interface EquEnergyRecordDao extends BaseMapper<EquEnergyRecordDo> {
             "\tFROM\n" +
             "\t\tequ_energy_record \n" +
             "\tWHERE\n" +
-            "\t\tCBDATE <= #{endTime} AND CBDATE >= #{startTime} \n" +
+            "\t\tCBDATE <= #{endTime} AND CBDATE >= #{startTime} AND DELETED = '0'  \n" +
             "\t) b ON a.METERID = b.METERID \n" +
             "\tAND b.rank = '1' \n" +
             "\tAND DATE_FORMAT( a.CBDATE, '%Y-%m-%d' ) = DATE_FORMAT( DATE_SUB( b.CBDATE, INTERVAL 1 DAY ), '%Y-%m-%d' ) \n" +