Commit 1268801e authored by chenzhao's avatar chenzhao

bug修复

parent e5ec5d41
...@@ -306,7 +306,7 @@ ...@@ -306,7 +306,7 @@
<where> <where>
ANALYSIS_OBJ_TYPE = '场站' ANALYSIS_OBJ_TYPE = '场站'
AND ANALYSIS_TYPE = '按天' AND ANALYSIS_TYPE = '按天'
AND DATE_FORMAT( REC_DATE, "%Y-%m-%d" ) = CURRENT_DATE AND DATE_FORMAT( REC_DATE, "%Y-%m-%d" ) = CURRENT_DATE - INTERVAL 1 DAY
<if test="areaCode != null and areaCode != ''"> <if test="areaCode != null and areaCode != ''">
AND ARAE like concat('%', #{areaCode}, '%') AND ARAE like concat('%', #{areaCode}, '%')
</if> </if>
...@@ -446,7 +446,7 @@ ...@@ -446,7 +446,7 @@
</select> </select>
<select id="getSubSystemInfo" resultType="java.util.Map"> <select id="getSubSystemInfo" resultType="java.util.Map">
SELECT SELECT
round(IFNULL( HEALTH_INDEX, 100 ), 1) AS healthIndex,`` round(IFNULL( HEALTH_INDEX, 100 ), 1) AS healthIndex,
SUB_SYSTEM AS subSystem SUB_SYSTEM AS subSystem
FROM FROM
fan_health_index_latest_data fan_health_index_latest_data
......
...@@ -169,14 +169,16 @@ public class EarningsForecastImpl { ...@@ -169,14 +169,16 @@ public class EarningsForecastImpl {
List<List<String>> buildData(List<Map<String, String>> data,JSONObject obj,List<List<String>> lists ){ List<List<String>> buildData(List<Map<String, String>> data,JSONObject obj,List<List<String>> lists ){
List<List<String>> newList = new ArrayList<>();
newList.addAll(lists);
JSONObject dataObject = obj.getJSONObject("data"); JSONObject dataObject = obj.getJSONObject("data");
// 从data对象中提取forecast和history数组 // 从data对象中提取forecast和history数组
JSONArray forecastArray = dataObject.getJSONArray("forecast"); JSONArray forecastArray = dataObject.getJSONArray("forecast");
for (int i = 0; i < forecastArray.size(); i++) { for (int i = 0; i < forecastArray.size(); i++) {
List<String> list = Arrays.asList(data.get(i).get("MonthYear"),forecastArray.getString(i)); List<String> list = Arrays.asList(data.get(i).get("MonthYear"),forecastArray.getString(i));
lists.add(list); newList.add(list);
} }
return lists; return newList;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment