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-14 15:00:55 +08:00
parent e348a10862
commit 52095ccd04
18 changed files with 114 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
ruoyi-system/src/main/resources/mapper/system/AorestCoverageMapper.xml
View File

@ -125,25 +125,35 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
]]>
</sql>
<select id="selectDic" resultMap="RM_Dictionary">
select <include refid="columnsdic"/> from dictionary
where dictionary in
(SELECT A.dictionary FROM dictionary a
join (select dictionary from dictionary
where 1=1
<if test="codingType!= null and codingType !=''">
AND coding_type = #{codingType}
</if>
<if test="codingType1!= null and codingType1 !=''">
AND dictionary = #{codingType1}
</if>
) b on a.coding_type=b.dictionary
<if test="codingType2!= null and codingType2 !=''">
AND a.dictionary = #{codingType2}
</if>
)
where 1=1
<if test="codingType!= null and codingType !=''">
AND coding_type = #{codingType}
</if>
</select>
<!-- <select id="selectDic" resultMap="RM_Dictionary">-->
<!-- select <include refid="columnsdic"/> from dictionary-->
<!-- where dictionary in-->
<!-- (SELECT A.dictionary FROM dictionary a-->
<!-- join (select dictionary from dictionary-->
<!-- where 1=1-->
<!-- <if test="codingType!= null and codingType !=''">-->
<!-- AND coding_type = #{codingType}-->
<!-- </if>-->
<!-- <if test="codingType1!= null and codingType1 !=''">-->
<!-- AND dictionary = #{codingType1}-->
<!-- </if>-->
<!-- ) b on a.coding_type=b.dictionary-->
<!-- <if test="codingType2!= null and codingType2 !=''">-->
<!-- AND a.dictionary = #{codingType2}-->
<!-- </if>-->
<!-- )-->
<!-- </select>-->
<select id="selectNow" resultMap="RM_Dictionary">
select <include refid="columnsdic"/> from dictionary

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

@ -98,6 +98,10 @@
<if test="country!= null and country !=''">
AND country = #{country}
</if>
<if test="year!= null and year !=''">
AND year = #{year}
</if>
</select>
</mapper>

6
ruoyi-system/src/main/resources/mapper/system/ThematicMapMapper.xml
View File

@ -25,6 +25,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="particularYear" column="particular_year"/>
<result property="layer" column="layer"/>
<result property="resolvingPower" column="resolving_power"/>
<result property="serviceType" column="service_type"/>
</resultMap>
<sql id="columns">
@ -34,7 +35,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</sql>
<sql id="cloumns_Map">
<![CDATA[
id,chart_name,chart_type,particular_year,layer,resolving_power
id,chart_name,chart_type,particular_year,layer,resolving_power,service_type
]]>
</sql>
@ -48,6 +49,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="chartName!= null and chartName !=''">
AND chart_name = #{chartName}
</if>
<if test="particularYear!= null and particularYear !=''">
AND particular_year = #{particularYear}
</if>
</select>
<select id="selectAllThematicMap" resultMap="RM_ThematicMap">