Commit 46426f53 authored by tangwei's avatar tangwei

修改户用监盘电站列表分页入参

parent c5e3c2d3
......@@ -57,7 +57,7 @@
<foreach collection="dto" item="item" index="index" open="(" separator="," close=")">
#{item}
</foreach>
and year = #{date}
GROUP BY `year_time`
</select>
......
......@@ -74,7 +74,7 @@ public class TDengineServerConfig {
@Bean
public PaginationInterceptor paginationInterceptor() {
PaginationInterceptor paginationInterceptor = new PaginationInterceptor();
paginationInterceptor.setDialectType("TAOS-RS");
paginationInterceptor.setDialectType("mysql");
return paginationInterceptor;
}
......
......@@ -207,14 +207,14 @@ public class JpStationServiceImpl extends BaseService<JpStationDto,JpStation,JpS
if(type.equals("month")){
map= getDayListOfMonth(reviewDto.getTimeDateMonth());
data= dayGenerateMapper.getDayGeneratqx(date, statioId);
data= dayGenerateMapper.getDayGeneratqx(reviewDto.getTimeDateMonth(), statioId);
}else if(type.equals("year")){
map= getyearListOfMonth(reviewDto.getTimeDateYear());
data= dayGenerateMapper.getMonthGenerateqx(date,statioId);
data= dayGenerateMapper.getMonthGenerateqx(reviewDto.getTimeDateYear(),statioId);
}else{
map= getyearList();
data= dayGenerateMapper.getYearGenerateqx(date, statioId);
data= dayGenerateMapper.getYearGenerateqx(null, statioId);
}
listx =map.get("x");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment