综合监测模块字段修改

ruoyi-system/src/main/resources/mapper/system/MonitorMapper.xml

@@ -111,6 +111,7 @@
         select id, year, type, region, region_en, excellent, good, middle, low, poor
         from monitor_eqi_grading
         where year = #{year}
+          and type = #{type}
           and region = #{region}
     </select>
 
@@ -163,19 +164,20 @@
                slight_rise,
                significant_rise
         from monitor_keqi
-        where region = #{region}
+        where type = #{type}
+          and region = #{region}
     </select>
 
     <select id="keqiAsiaRate" resultMap="Monitor_KEQI_Asia_Rate">
         select id,
                region,
                region_en,
-               cast((cast(vegetation as decimal)*100) as decimal(10,2)) as vegetation,
-               cast((cast(forest as decimal)*100) as decimal(10,2)) as forest,
-               cast((cast(shrub as decimal)*100) as decimal(10,2)) as shrub,
-               cast((cast(grass as decimal)*100) as decimal(10,2)) as grass,
-               cast((cast(farmland as decimal)*100) as decimal(10,2)) as farmland,
-               cast((cast(mountain as decimal)*100) as decimal(10,2)) as mountain
+               cast((cast(vegetation as decimal) * 100) as decimal(10, 2)) as vegetation,
+               cast((cast(forest as decimal) * 100) as decimal(10, 2))     as forest,
+               cast((cast(shrub as decimal) * 100) as decimal(10, 2))      as shrub,
+               cast((cast(grass as decimal) * 100) as decimal(10, 2))      as grass,
+               cast((cast(farmland as decimal) * 100) as decimal(10, 2))   as farmland,
+               cast((cast(mountain as decimal) * 100) as decimal(10, 2))   as mountain
         from monitor_keqi_asia_rate
     </select>
 
@@ -183,7 +185,7 @@
         select mkcr.id,
                mkcr.country,
                mkcr.country_en,
-               cast((cast(mkcr.all as decimal)*100) as decimal(10,2)) as all,
+               cast((cast(mkcr.all as decimal) * 100) as decimal(10, 2)) as all,
                cast((cast(mkcr.forest as decimal)*100) as decimal(10,2)) as forest,
                cast((cast(mkcr.shrub as decimal)*100) as decimal(10,2)) as shrub,
                cast((cast(mkcr.grass as decimal)*100) as decimal(10,2)) as grass,
@@ -192,4 +194,26 @@
         from monitor_keqi_country_rate mkcr
         where mkcr.country = #{country}
     </select>
+
+    <select id="eqiAsiaLine" resultMap="Monitor_EQI_Asia">
+        select mea.id,
+               mea.year,
+               mea.region,
+               mea.region_en,
+               mea.all,
+               mea.forest,
+               mea.shrub,
+               mea.grass,
+               mea.farmland,
+               mea.mountain
+        from monitor_eqi_asia mea
+        where mea.region = #{region}
+        <if test="start != null and start != ''">
+            and mea.year >= #{start}
+        </if>
+        <if test="end != null and end != ''">
+            and #{end} >= mea.year
+        </if>
+
+    </select>
 </mapper>