Commit aa11b8f4 authored by chenzhao's avatar chenzhao

修改代码

parent 82318051
...@@ -71,10 +71,10 @@ ...@@ -71,10 +71,10 @@
AND `level` = #{level} AND `level` = #{level}
</if> </if>
<if test="minvalue != null and minvalue != ''"> <if test="minvalue != null and minvalue != ''">
time_long >= #{minvalue} AND time_long >= #{minvalue}
</if> </if>
<if test="maxValue != null and maxValue != ''"> <if test="maxValue != null and maxValue != ''">
AND time_long <![CDATA[<=]]> #{maxValue} AND time_long <![CDATA[<=]]> #{maxValue}
</if> </if>
<if test="snCode != null and snCode != ''"> <if test="snCode != null and snCode != ''">
AND sn_code like #{snCode} AND sn_code like #{snCode}
...@@ -95,6 +95,7 @@ ...@@ -95,6 +95,7 @@
AND content like #{content} AND content like #{content}
</if> </if>
</where> </where>
ORDER BY start_time desc
limit #{current},#{size} limit #{current},#{size}
</select> </select>
......
...@@ -520,7 +520,7 @@ public class JpStationController extends BaseController { ...@@ -520,7 +520,7 @@ public class JpStationController extends BaseController {
Map<String,Object> map=new HashMap<>(); Map<String,Object> map=new HashMap<>();
DecimalFormat format2 = new DecimalFormat("0.00"); DecimalFormat format2 = new DecimalFormat("0.000");
//炭 //炭
map.put("name1","实时功率(kW)"); map.put("name1","实时功率(kW)");
map.put("name2","组件总容量(MWp)"); map.put("name2","组件总容量(MWp)");
......
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