diff --git a/client/src/main/java/com/small/client/dao/SxDataDao.java b/client/src/main/java/com/small/client/dao/SxDataDao.java index ab583823..b8835ee8 100644 --- a/client/src/main/java/com/small/client/dao/SxDataDao.java +++ b/client/src/main/java/com/small/client/dao/SxDataDao.java @@ -612,7 +612,7 @@ public class SxDataDao extends BaseDao{ public Integer getNewActiveCount(DataBaseInfo dataBaseInfo){ String where=dataBaseInfo.getWhere()+" and rule_no in('DD','PS','PM') and range_flag='I'"; return getBaseTotal(dataBaseInfo.getIp(),dataBaseInfo.getUserName(),dataBaseInfo.getPassword(),dataBaseInfo.getDbPort(),dataBaseInfo.getDataBaseName(), - T_PUB_PLAN_MASTER,where); + T_PUB_PLAN_MASTER+" b",where); } /** diff --git a/client/src/main/java/com/small/client/service/imp/SxDataServiceImp.java b/client/src/main/java/com/small/client/service/imp/SxDataServiceImp.java index be756656..c6ff1ea0 100644 --- a/client/src/main/java/com/small/client/service/imp/SxDataServiceImp.java +++ b/client/src/main/java/com/small/client/service/imp/SxDataServiceImp.java @@ -728,7 +728,7 @@ public class SxDataServiceImp extends SxDataAbstService implements SxDataService String where="where 1=1"; Integer total =0; if(StringUtils.isNotEmpty(commentModel.getSyncTime())){ - where+=" and b.start_date>'"+commentModel.getSyncTime()+"' "; + where+=" and b.oper_date>'"+commentModel.getSyncTime()+"' "; // where+=" or b.oper_date>'"+commentModel.getSyncTime()+"') "; } dataBaseInfo.setWhere(where);