Commit e4cb9595 authored by chenzhao's avatar chenzhao

修改代码

parent 79678d03
...@@ -186,6 +186,6 @@ public class JpInverter implements Serializable { ...@@ -186,6 +186,6 @@ public class JpInverter implements Serializable {
@TableField("addr") @TableField("addr")
private String addr; private String addr;
@TableField("name") @TableField("sn_name")
private String name; private String name;
} }
...@@ -112,9 +112,13 @@ public class JpInverterDto extends BaseDto { ...@@ -112,9 +112,13 @@ public class JpInverterDto extends BaseDto {
@ApiModelProperty(value = "所属电站名称") @ApiModelProperty(value = "所属电站名称")
private String name; private String name;
private String snName;
@ApiModelProperty(value = "筛选用 最小值") @ApiModelProperty(value = "筛选用 最小值")
private Double minValue; private Double minValue;
@ApiModelProperty(value = "筛选用 最大值") @ApiModelProperty(value = "筛选用 最大值")
private Double maxValue; private Double maxValue;
} }
...@@ -172,6 +172,6 @@ public class JpInverter extends BaseEntity { ...@@ -172,6 +172,6 @@ public class JpInverter extends BaseEntity {
@TableField("addr") @TableField("addr")
private String addr; private String addr;
@TableField("name") @TableField("sn_name")
private String name; private String snName;
} }
...@@ -70,7 +70,7 @@ ...@@ -70,7 +70,7 @@
hjc.third_code, hjc.third_code,
hjc.station_name, hjc.station_name,
hjc.addr, hjc.addr,
hjc.name as snName, hjc.sn_name as snName,
sta.type as stationType, sta.type as stationType,
(select COMPANY_NAME from privilege_company where ORG_CODE = sta.regional_companies_code ) as companyName (select COMPANY_NAME from privilege_company where ORG_CODE = sta.regional_companies_code ) as companyName
from from
......
...@@ -439,7 +439,7 @@ public class JpInverterController extends BaseController { ...@@ -439,7 +439,7 @@ public class JpInverterController extends BaseController {
jpInverterDto.setZL(collect.get("直流")); jpInverterDto.setZL(collect.get("直流"));
jpInverterDto.setJL(collect.get("交流")); jpInverterDto.setJL(collect.get("交流"));
jpInverterDto.setSnName(jpInverter.getSnName());
jpInverterDto.setDirectCurrent(collect.get("直流")); jpInverterDto.setDirectCurrent(collect.get("直流"));
jpInverterDto.setInterflow(collect.get("交流")); jpInverterDto.setInterflow(collect.get("交流"));
......
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