Commit f359b5a3 authored by chenzhao's avatar chenzhao

修改代码

parent cf29606c
...@@ -4,13 +4,13 @@ ...@@ -4,13 +4,13 @@
<select id="selectYearTrend" resultType="map"> <select id="selectYearTrend" resultType="map">
SELECT SELECT
day_time as dayTime, month_time as daytime,
generate, generate,
fullhour fullhour
from from
house_pv_data.td_hygf_inverter_year_generate house_pv_data.td_hygf_inverter_year_generate
<where> <where>
year_month = #{time} `year` = #{time}
<if test="snCode != null and snCode !=''"> <if test="snCode != null and snCode !=''">
and sn_code = #{snCode} and sn_code = #{snCode}
</if> </if>
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
<select id="selectTotalTrend" resultType="map"> <select id="selectTotalTrend" resultType="map">
SELECT SELECT
day_time as dayTime, year_time as dayTime,
generate, generate,
fullhour fullhour
from from
...@@ -66,7 +66,7 @@ ...@@ -66,7 +66,7 @@
generate, generate,
fullhour fullhour
from from
house_pv_data.td_hygf_inverter_year_generate house_pv_data.td_hygf_inverter_total_generate
<where> <where>
<if test="time != null and time !=''"> <if test="time != null and time !=''">
year_time = #{time} year_time = #{time}
......
...@@ -258,7 +258,7 @@ public class JpInverterServiceImpl extends BaseService<JpInverterDto, JpInverter ...@@ -258,7 +258,7 @@ public class JpInverterServiceImpl extends BaseService<JpInverterDto, JpInverter
Map<String,Object> map = new HashMap<>(); Map<String,Object> map = new HashMap<>();
Map<String,Object> map1 = new HashMap<>(); Map<String,Object> map1 = new HashMap<>();
map1.put("name","发电量"); map1.put("name","发电量");
map1.put("unit","Kw"); map1.put("unit","kw");
map1.put("data",value1); map1.put("data",value1);
yData.add(map1); yData.add(map1);
Map<String,Object> map2 = new HashMap<>(); Map<String,Object> map2 = new HashMap<>();
...@@ -285,7 +285,7 @@ public class JpInverterServiceImpl extends BaseService<JpInverterDto, JpInverter ...@@ -285,7 +285,7 @@ public class JpInverterServiceImpl extends BaseService<JpInverterDto, JpInverter
Map<String,Object> map = new HashMap<>(); Map<String,Object> map = new HashMap<>();
Map<String,Object> map1 = new HashMap<>(); Map<String,Object> map1 = new HashMap<>();
map1.put("name","发电量"); map1.put("name","发电量");
map1.put("unit","Kw"); map1.put("unit","kw");
map1.put("data",value1); map1.put("data",value1);
yData.add(map1); yData.add(map1);
Map<String,Object> map2 = new HashMap<>(); Map<String,Object> map2 = new HashMap<>();
...@@ -312,7 +312,7 @@ public class JpInverterServiceImpl extends BaseService<JpInverterDto, JpInverter ...@@ -312,7 +312,7 @@ public class JpInverterServiceImpl extends BaseService<JpInverterDto, JpInverter
Map<String,Object> map = new HashMap<>(); Map<String,Object> map = new HashMap<>();
Map<String,Object> map1 = new HashMap<>(); Map<String,Object> map1 = new HashMap<>();
map1.put("name","发电量"); map1.put("name","发电量");
map1.put("unit","Kw"); map1.put("unit","kw");
map1.put("data",value1); map1.put("data",value1);
yData.add(map1); yData.add(map1);
Map<String,Object> map2 = new HashMap<>(); Map<String,Object> map2 = new HashMap<>();
......
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