Song/xkrs_ms
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

数据流动年份

Browse Source
This commit is contained in:
machao
2022-12-07 17:16:21 +08:00
parent 94c0e196ed
commit ef66a3ff00
6 changed files with 23 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/CityFocusVO.java
View File

@ -7,6 +7,8 @@ package com.ruoyi.system.domain_yada;
public class CityFocusVO extends SysBaseEntity {
private String id;
private String year;
private String xAxis;
private String yAxis;
@ -63,6 +65,15 @@ public class CityFocusVO extends SysBaseEntity {
// this.year = year;
// }
public String getYear() {
return year;
}
public void setYear(String year) {
this.year = year;
}
public String getxAxisPy() {
return xAxisPy;
}

3
ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/CityExpandMapper.java
View File

@ -14,7 +14,8 @@ import java.util.List;
public interface CityExpandMapper {
List<CityFocusVO> selectExpand(@Param("city") String city,
@Param("country") String country);
@Param("country") String country,
@Param("year") String year);
List<OrientationVO> selectOrientation(@Param("city") String city,
@Param("superior") String superior,

2
ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/CityExpandServiceimpl.java
View File

@ -26,7 +26,7 @@ public class CityExpandServiceimpl implements ICityExpandService {
@Override
public List<CityFocusVO> selectExpand(String city, String country, String year) {
return mapper.selectExpand(city, country);
return mapper.selectExpand(city, country,year);
}
@Override

5
ruoyi-system/src/main/resources/mapper/system/CityExpandMapper.xml
View File

@ -51,7 +51,7 @@
<sql id="columns">
<![CDATA[
id,city,x_axis,y_axis,x_axis_py,y_axis_py,city_en,country
id,year,city,x_axis,y_axis,x_axis_py,y_axis_py,city_en,country
]]>
</sql>
@ -64,6 +64,9 @@
<if test="country!= null and country !=''">
AND country = #{country}
</if>
<if test="year!= null and year !=''">
AND year = #{year}
</if>
</select>
<resultMap id="RM_Inform" type="com.ruoyi.system.domain_yada.CityInformation">