diff --git a/src/main/java/com/ifish/serviceImpl/FactoryServiceImpl.java b/src/main/java/com/ifish/serviceImpl/FactoryServiceImpl.java index 042aee3..a67e902 100644 --- a/src/main/java/com/ifish/serviceImpl/FactoryServiceImpl.java +++ b/src/main/java/com/ifish/serviceImpl/FactoryServiceImpl.java @@ -67,8 +67,7 @@ public class FactoryServiceImpl implements FactoryService { public int getDeviceCountByFactory(String factoryCode, String billMonth) { String year = billMonth.split("-")[0]; String month = billMonth.split("-")[1]; - int count = this.deviceDao.getNumber("SELECT count(1) from tbl_device td where td.is_charge = '0' and td.factory_code = '"+ factoryCode +"' and str_to_date(td.authorize_time,'%Y-%m')='" + year + "-" + month + "-00'"); - return count; + return this.deviceDao.getNumber("SELECT count(1) from tbl_device td where td.is_charge = '0' and is_blacklist = 0 and td.factory_code = '"+ factoryCode +"' and str_to_date(td.authorize_time,'%Y-%m')='" + year + "-" + month + "-00'"); } @Override