diff --git a/src/main/java/com/ifish/job/PayBillJob.java b/src/main/java/com/ifish/job/PayBillJob.java index 76419b9..7069157 100644 --- a/src/main/java/com/ifish/job/PayBillJob.java +++ b/src/main/java/com/ifish/job/PayBillJob.java @@ -80,8 +80,6 @@ public class PayBillJob { factoryService.savePayBill(payBill); } } - - log.info("addPayBill end ..."); } } diff --git a/src/main/java/com/ifish/serviceImpl/FactoryServiceImpl.java b/src/main/java/com/ifish/serviceImpl/FactoryServiceImpl.java index 9ae381f..f2a6525 100644 --- a/src/main/java/com/ifish/serviceImpl/FactoryServiceImpl.java +++ b/src/main/java/com/ifish/serviceImpl/FactoryServiceImpl.java @@ -59,7 +59,7 @@ public class FactoryServiceImpl implements FactoryService { Calendar calendar = Calendar.getInstance(); String year = String.valueOf(calendar.get(Calendar.YEAR)); String month = (calendar.get(Calendar.MONTH) < 10 ? "0" + calendar.get(Calendar.MONTH) : calendar.get(Calendar.MONTH)) + ""; - int count = this.deviceDao.getNumber("SELECT count(1) from tbl_device td where td.factory_code = '"+ factoryCode +"' and str_to_date(td.authorize_time,'%Y-%m')='" + year + "-" + month + "-00'"); + 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; }