Commit 79678d03 authored by chenzhao's avatar chenzhao

修改代码

parent 32f052f8
...@@ -681,6 +681,7 @@ public class GoLangDataAcquisitionServiceImpl implements GoLangDataAcquisitionSe ...@@ -681,6 +681,7 @@ public class GoLangDataAcquisitionServiceImpl implements GoLangDataAcquisitionSe
tdHYGFInverterTotalGenerate = new TdHYGFInverterTotalGenerate(); tdHYGFInverterTotalGenerate = new TdHYGFInverterTotalGenerate();
} }
tdHYGFInverterTotalGenerate.setThirdStationId(jpInverter.getThirdStationId()); tdHYGFInverterTotalGenerate.setThirdStationId(jpInverter.getThirdStationId());
tdHYGFInverterTotalGenerate.setName(jpInverter.getName());
tdHYGFInverterTotalGenerate.setSnCode(jpInverter.getSnCode().trim()); tdHYGFInverterTotalGenerate.setSnCode(jpInverter.getSnCode().trim());
tdHYGFInverterTotalGenerate.setYearTime(DateUtil.format(today1, "yyyy")); tdHYGFInverterTotalGenerate.setYearTime(DateUtil.format(today1, "yyyy"));
tdHYGFInverterTotalGenerate.setYear(DateUtil.format(today1, "yyyy")); tdHYGFInverterTotalGenerate.setYear(DateUtil.format(today1, "yyyy"));
......
...@@ -104,4 +104,6 @@ public class JpInverterDtoNew extends BaseDto { ...@@ -104,4 +104,6 @@ public class JpInverterDtoNew extends BaseDto {
@ApiModelProperty(value = "电站类型") @ApiModelProperty(value = "电站类型")
private String stationType; private String stationType;
private String snName;
} }
...@@ -172,4 +172,6 @@ public class JpInverter extends BaseEntity { ...@@ -172,4 +172,6 @@ public class JpInverter extends BaseEntity {
@TableField("addr") @TableField("addr")
private String addr; private String addr;
@TableField("name")
private String name;
} }
...@@ -70,6 +70,7 @@ ...@@ -70,6 +70,7 @@
hjc.third_code, hjc.third_code,
hjc.station_name, hjc.station_name,
hjc.addr, hjc.addr,
hjc.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
......
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