|
@ -70,18 +70,13 @@ public class BaseSyncDataService extends BaseJpaService<BaseSyncDataDO, BaseSync
|
|
|
|
|
|
StringBuffer sql= new StringBuffer("SELECT c.* FROM wlyy_data_sync c WHERE 1=1 ");
|
|
|
StringBuffer sqlCount= new StringBuffer();
|
|
|
List<BaseSyncDataDO> list=null;
|
|
|
if ("xm_ykyy_wx".equalsIgnoreCase(wechatId)){
|
|
|
sqlCount.append("SELECT COUNT(c.\"id\") AS count FROM wlyy_data_sync c WHERE 1=1 ");
|
|
|
}else {
|
|
|
sqlCount.append("SELECT COUNT(c.id) AS count FROM wlyy_data_sync c WHERE 1=1 ");
|
|
|
}
|
|
|
// AND c."complete_time" BETWEEN to_date('2020-05-06 00:00:00','yyyy-mm-dd hh24:mi:ss') AND to_date('2020-08-06 00:00:00','yyyy-mm-dd hh24:mi:ss')
|
|
|
sql.append(" AND c.\"complete_time\" BETWEEN to_date('").append(startTime).append("00:00:00','yyyy-mm-dd hh24:mi:ss') AND to_date('").append(endTime).append("23:59:59','yyyy-mm-dd hh24:mi:ss')");
|
|
|
sqlCount.append(" AND c.\"complete_time\" BETWEEN to_date('").append(startTime).append("00:00:00','yyyy-mm-dd hh24:mi:ss') AND to_date('").append(endTime).append("23:59:59','yyyy-mm-dd hh24:mi:ss')");
|
|
|
|
|
|
if (StringUtils.isNotBlank(startTime)&&StringUtils.isNotBlank(endTime)){
|
|
|
sql.append(" and c.complete_time BETWEEN ").append("'").append(startTime).append("'").append(" AND ").append("'").append(endTime).append("'");
|
|
|
sqlCount.append(" and c.complete_time BETWEEN ").append("'").append(startTime).append("'").append(" AND ").append("'").append(endTime).append("'");
|
|
|
}
|
|
|
List<BaseSyncDataDO> list=null;
|
|
|
if ("xm_ykyy_wx".equalsIgnoreCase(wechatId)){
|
|
|
String oracleSql="SELECT\n" +
|
|
|
"\t*\n" +
|
|
|
"FROM\n" +
|
|
@ -101,11 +96,19 @@ public class BaseSyncDataService extends BaseJpaService<BaseSyncDataDO, BaseSync
|
|
|
logger.info("oracleSql="+oracleSql);
|
|
|
list = jdbcTemplate.query(oracleSql, new BeanPropertyRowMapper<>(BaseSyncDataDO.class));
|
|
|
}else {
|
|
|
sqlCount.append("SELECT COUNT(c.id) AS count FROM wlyy_data_sync c WHERE 1=1 ");
|
|
|
if (StringUtils.isNotBlank(startTime)&&StringUtils.isNotBlank(endTime)){
|
|
|
sql.append(" and c.complete_time BETWEEN ").append("'").append(startTime).append("'").append(" AND ").append("'").append(endTime).append("'");
|
|
|
sqlCount.append(" and c.complete_time BETWEEN ").append("'").append(startTime).append("'").append(" AND ").append("'").append(endTime).append("'");
|
|
|
}
|
|
|
|
|
|
sql.append(" ORDER BY c.create_time DESC LIMIT ").append((page-1)*size).append(",").append(size);
|
|
|
logger.info("sql="+sql);
|
|
|
list = jdbcTemplate.query(sql.toString(), new BeanPropertyRowMapper<>(BaseSyncDataDO.class));
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
logger.info("sqlCount="+sqlCount);
|
|
|
List<Map<String, Object>> mapList = jdbcTemplate.queryForList(sqlCount.toString());
|
|
|
|