diff --git a/src/main/java/com/baiyee/adcallback/service/impl/DmpMonitorNumServiceImpl.java b/src/main/java/com/baiyee/adcallback/service/impl/DmpMonitorNumServiceImpl.java index 4a07af7..ad61d5d 100644 --- a/src/main/java/com/baiyee/adcallback/service/impl/DmpMonitorNumServiceImpl.java +++ b/src/main/java/com/baiyee/adcallback/service/impl/DmpMonitorNumServiceImpl.java @@ -56,7 +56,7 @@ public class DmpMonitorNumServiceImpl implements DmpMonitorNumService { private List getImeiNum(Date startDate, Date endDate, String tag) { List imel = new ArrayList<>(); - int value = tag.contains(StrPool.UNDERLINE) ? DeliveryPlatformEnum.getValue + int value = tag.contains(StrPool.DASHED) ? DeliveryPlatformEnum.getValue (tag.substring(0, tag.indexOf(StrPool.DASHED))) : tag.equalsIgnoreCase(SqlConstant.TABLE_JU_QIAN) ? 1 : 999; switch (value) { @@ -116,11 +116,11 @@ public class DmpMonitorNumServiceImpl implements DmpMonitorNumService { @Transactional(rollbackFor = Exception.class) public List getImeiNumJpa(String tableName, Date startDate, Date endDate, String tag) { StringBuilder sql = new StringBuilder(); - sql.append("select DISTINCT tb.gmt_create as gmtCreate ,tb.imei as imei from " + tableName + " as tb where 1=1"); - sql.append(" and tb.imei != :imei1 "); + sql.append("select DISTINCT DATE_FORMAT( tb.gmt_create, '%Y-%m-%d' ) as gmtCreate ,tb.imei as imei from " + tableName + " as tb where"); + sql.append(" tb.imei != :imei1 "); sql.append(" and tb.imei != :imei2 "); sql.append(" and tb.gmt_create >= :startDate "); - sql.append(" and tb.gmt_create <= :endDate "); + sql.append(" and tb.gmt_create < :endDate "); sql.append(" and tb.tag = :tag "); Query query = entityManager.createNativeQuery(sql.toString()); query.setParameter("imei1", "");