Merge branch 'master' into energy-manage-shiyue

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,

energy-manage-service/src/main/resources/mybatis/system/OrganizationAuthMapper.xml

@@ -186,7 +186,7 @@
             (select field_code as fieldCode,count(1) as uncorrelatedCount from analysis_result where analysis_state = -1  group by field_code) uar
             on soa.code_number = uar.fieldCode
             left join
-            (select field_code as fieldCode,count(1) as errCount from analysis_result where 	err_state = 1  group by field_code) uer
+            (select field_code as fieldCode,count(1) as errCount from analysis_result where 	err_state = 1 and analysis_state = 30  group by field_code) uer
             on soa.code_number = uer.fieldCode
             left join
             (select field_code as fieldCode,count(1) as qCount from analysis_result where 	analysis_state = 10  group by field_code) uqr
@@ -210,7 +210,7 @@
             wr.code_number
             from sys_organization_auth a
             inner join wind_relation wr on a.code_number = wr.code_number where 1=1 and a.role_id =  #{roleId} and wr.type = 'field')
-        and err_state = 1
+        and err_state = 1 and analysis_state = 30
         </select>
 
 </mapper>