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

不透水面修改

Browse Source
This commit is contained in:
songjinsheng
2022-07-12 16:31:23 +08:00
parent 2a64885193
commit e348a10862
9 changed files with 61 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -10,17 +10,18 @@
<result property="city" column="city"/>
<result property="areaValue" column="area_value"/>
<result property="superior" column="superior"/>
<result property="country" column="country"/>
<result property="createBy" column="created_by"/>
<result property="createTime" column="created_time"/>
</resultMap>
<sql id="columns_ore">
<![CDATA[
id,position,city,area_value,superior,created_by,created_time
id,position,city,area_value,superior,created_by,created_time,country
]]>
</sql>
<select id="selectOrientation" resultMap="RM_Expand">
<select id="selectOrientation" resultMap="RM_Orientation">
SELECT <include refid="columns_ore"/> FROM extension_orientation
where 1=1
<if test="city!= null and city !=''">
@ -29,6 +30,9 @@
<if test="superior!= null and superior !=''">
AND superior = #{superior}
</if>
<if test="country!= null and country !=''">
AND country = #{country}
</if>
</select>
<resultMap id="RM_Expand" type="com.ruoyi.system.domain_yada.CityFocusVO">
@ -39,25 +43,26 @@
<result property="yAxis" column="y_axis"/>
<result property="xAxisPy" column="x_axis_py"/>
<result property="yAxisPy" column="y_axis_py"/>
<result property="cityCh" column="city_ch"/>
<result property="cityEn" column="city_en"/>
<result property="country" column="country"/>
<result property="createBy" column="created_by"/>
<result property="createTime" column="created_time"/>
</resultMap>
<sql id="columns">
<![CDATA[
id,year,city,x_axis,y_axis,x_axis_py,y_axis_py,city_ch
id,year,city,x_axis,y_axis,x_axis_py,y_axis_py,city_en,country
]]>
</sql>
<select id="selectExpand" resultMap="RM_Expand">
SELECT <include refid="columns"/> FROM Urban_center_of_gravity
SELECT <include refid="columns"/> FROM urban_center_of_gravity
where 1=1
<if test="city!= null and city !=''">
AND city = #{city}
</if>
<if test="cityCh!= null and cityCh !=''">
AND city_ch = #{cityCh}
<if test="country!= null and country !=''">
AND country = #{country}
</if>
<if test="year!= null and year !=''">
AND year = #{year}
@ -90,8 +95,8 @@
<if test="city!= null and city !=''">
AND city = #{city}
</if>
<if test="superior!= null and superior !=''">
AND superior = #{superior}
<if test="country!= null and country !=''">
AND country = #{country}
</if>
</select>

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

@ -40,12 +40,13 @@
<result property="position" column="position"/>
<result property="areaValue" column="area_Value"/>
<result property="superior" column="superior"/>
<result property="country" column="country"/>
<result property="createTime" column="created_Time"/>
<result property="createBy" column="created_By"/>
</resultMap>
<sql id="columns1">
<![CDATA[
id,city,superior,area_Value,position,created_Time,created_By
id,city,superior,area_Value,position,created_Time,created_By,country
]]>
</sql>
@ -57,7 +58,7 @@
AND city = #{city}
</if>
<if test="gj!= null and gj !=''">
AND superior = #{gj}
AND country = #{gj}
</if>
</select>