Commit c76c5b5a authored by ZWT's avatar ZWT

feat(吉林演示): 松原

1.修改系统首页大屏总览接口,增加区分组织机构逻辑,完成接口冒烟测试;
2.修改系统首页获取井场列表接口,增加区分组织机构逻辑,完成接口冒烟测试;
3.修改系统首页井场功能下钻后提示报错问题,修改用电功率数据获取逻辑,修复报错问题;

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent 34ee9f75
......@@ -23,4 +23,7 @@ public class QueryBasePowerLineViewInput extends XPageInput {
@XText("线路名称")
private String lineName;
@XText("线路类型key(字典获取)")
private String lineTypeKey;
}
......@@ -85,6 +85,9 @@
<if test="lineName != null and lineName != ''">
AND b.line_name LIKE CONCAT( '%', #{lineName}, '%' )
</if>
<if test="lineTypeKey != null and lineTypeKey != ''">
AND b.line_type_key = #{lineTypeKey}
</if>
ORDER BY
o.ou_name ASC,
b.line_type_key ASC,
......
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