分析类型顺序添加

energy-manage-service/src/main/java/com/energy/manage/service/mappers/analysis/AnalysisTypeMapper.java

@@ -42,4 +42,10 @@ public interface AnalysisTypeMapper extends MyMapper <AnalysisTypePo>{
      * @return
      */
     String selecFlagByCode(@Param("typeCode") String typeCode);
+
+    /**
+     * 按照顺序查询
+     * @return
+     */
+    List<AnalysisTypePo> selectAllByOrderNum();
 }

energy-manage-service/src/main/java/com/energy/manage/service/service/analysis/impl/AnalysisServiceImpl.java

@@ -459,7 +459,7 @@ public class AnalysisServiceImpl implements AnalysisService {
      * @return
      */
     private List<Map<String, Object>> getAnalysisType(Set<String> analysisCodes){
-        List<AnalysisTypePo> analysisTypePos = analysisTypeMapper.selectAll();
+        List<AnalysisTypePo> analysisTypePos = analysisTypeMapper.selectAllByOrderNum();
         if(CollectionUtils.isNotEmpty(analysisCodes)){
             analysisTypePos = analysisTypePos.stream().filter(item -> analysisCodes.contains(item.getTypeCode())).collect(Collectors.toList());
         }

energy-manage-service/src/main/resources/mybatis/analysis/AnalysisTypeMapper.xml

@@ -21,6 +21,12 @@
         where parent_id != 0
     </select>
 
+    <select id="selectAllByOrderNum" resultMap="BaseResultMap">
+        select *
+        from analysis_type
+        order by order_num
+    </select>
+
     <select id="selectByTypeCode" parameterType="java.lang.String" resultType="com.energy.manage.service.domain.vo.analysis.AnalysisTypeVo">
         select parent_id,
                type_code,