综合统计-默认获取最新年份数据

src/main/java/com/elephant/framework/galaxy/aroad/module/zhtj/mapper/ZhtjGljsdjqkMapper.java

@@ -18,4 +18,6 @@ import java.util.Map;
 public interface ZhtjGljsdjqkMapper extends BaseMapper<ZhtjGljsdjqk> {
    //查詢普通公路覆蓋情況
    List<ZhtjGljsdjqk> selectZhtjGljsdjqk(String area,String type);
+   // 查询最新年份
+   String newYear(@Param("type")String type);
 }

src/main/java/com/elephant/framework/galaxy/aroad/module/zhtj/service/impl/ZhtjGljsdjqkServiceImpl.java

@@ -100,13 +100,21 @@ public class ZhtjGljsdjqkServiceImpl extends ServiceImpl<ZhtjGljsdjqkMapper, Zht
         return ipage;
     }
 
+    /**
+     * 全省公路技术等级划分Echarts、全省公路行政等级划分Echarts
+     * @return
+     */
     @Override
     public Map<String, Object> getQsgljsxz() {
         Map<String,Object> resultMap = new HashMap<>();
+        // 获取省道最新年份
+        String sdnewYear = zgtjgljsdjqkMapper.newYear("'省道'");
         // 获取全省公路技术等级划分
-        ZhtjGljsdjqk zhtjGljszkpd = super.getOne(Wrappers.<ZhtjGljsdjqk>query().lambda().eq(ZhtjGljsdjqk::getArea,"合计").eq(ZhtjGljsdjqk::getType,"省道"));
+        ZhtjGljsdjqk zhtjGljszkpd = super.getOne(Wrappers.<ZhtjGljsdjqk>query().lambda().eq(ZhtjGljsdjqk::getArea,"合计").eq(ZhtjGljsdjqk::getType,"省道").eq(ZhtjGljsdjqk::getYear,sdnewYear));
+        // 获取全省行政等级最新年份
+        String sdxznewYear = zgtjgljsdjqkMapper.newYear("'国道','省道','县道','乡道','村道','专用公路','总计'");
         // 获取全省行政等级划分
-        List<ZhtjGljsdjqk> zhtjGljszkpdList = super.list(Wrappers.<ZhtjGljsdjqk>query().lambda().eq(ZhtjGljsdjqk::getArea,"合计").in(ZhtjGljsdjqk::getType,"国道","省道","县道","乡道","村道","专用公路","总计"));
+        List<ZhtjGljsdjqk> zhtjGljszkpdList = super.list(Wrappers.<ZhtjGljsdjqk>query().lambda().eq(ZhtjGljsdjqk::getArea,"合计").in(ZhtjGljsdjqk::getType,"国道","省道","县道","乡道","村道","专用公路","总计").eq(ZhtjGljsdjqk::getYear,sdxznewYear));
         // 存储行政等级处理结果
         List<Map<String,Object>> withinList = new ArrayList<>();
         List<Map<String,Object>> abroadData = new ArrayList<>();
@@ -131,6 +139,7 @@ public class ZhtjGljsdjqkServiceImpl extends ServiceImpl<ZhtjGljsdjqkMapper, Zht
         resultMap.put("glxzdjhf",new HashMap<String,Object>(){{
             put("withinList",withinList);
             put("abroadData",abroadData);
+            put("glxzdjhfYear",sdxznewYear);
         }});
         return resultMap;
     }

src/main/resources/application-dev.yml

@@ -5,7 +5,7 @@ spring:
     driver-class-name: com.mysql.jdbc.Driver
     url: jdbc:mysql://127.0.0.1:3306/aroad?useUnicode=true&characterEncoding=utf-8&useSSL=false
     username: root
-    password: 123456
+    password: root
   cache:
     type: redis
   redis:

src/main/resources/mapper/zhtj/ZhtjGljsdjqkMapper.xml

@@ -27,10 +27,18 @@
         <result property="delFlag" column="del_flag"/>
         <result property="remarks" column="remarks"/>
   </resultMap>
+    <sql id="maxYear">
+        select max(year) maxyear from `t_zhtj_gljsdjqk`
+    </sql>
       <select id="selectZhtjGljsdjqk" resultMap="zhtjGljsdjqkMap">
             SELECT * FROM `t_zhtj_gljsdjqk` as tsd where area=#{area} and type in (${type}) and year = (
-          select max(year) maxyear from `t_zhtj_gljsdjqk`
+            <include refid="maxYear"/>
          )
-
       </select>
+    <select id="newYear" resultType="string">
+        <include refid="maxYear"/>
+        <if test="type != null and type != ''">
+            where type in (${type})
+        </if>
+    </select>
 </mapper>