Merge branch 'dev_third_data' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_temp

epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexGridSubScoreDao.xml

@@ -46,9 +46,11 @@
             fact.index_code,
             IF(fact.origin_value='',0,IFNULL(fact.origin_value,0)) AS origin_value,
             round(fact.score,1) AS score,
-            round(fact.WEIGHT,2) AS weight
+            round(fact.WEIGHT,2) AS weight,
+            dict.VALUE_TYPE
         FROM
             fact_index_grid_sub_score fact
+             LEFT JOIN index_dict dict ON fact.index_code = dict.index_code
         WHERE
             fact.del_flag = '0'
             AND fact.all_parent_index_code = #{allParentIndexCode}