Commit e2eca41b authored by hezhuozhi's avatar hezhuozhi

修复电站监控报表导出和展示不一致

parent db469fb2
...@@ -36,9 +36,10 @@ public class JpStationDto extends BaseDto { ...@@ -36,9 +36,10 @@ public class JpStationDto extends BaseDto {
@ExcelProperty(value = "电站名称", index = 1) @ExcelProperty(value = "电站名称", index = 1)
@ApiModelProperty(value = "电站名称") @ApiModelProperty(value = "电站名称")
private String name; private String name;
@ExcelProperty(value = "电站编号", index = 0)
@ApiModelProperty(value = "电站编码")
private String code; private String code;
@ExcelProperty(value = "序号", index = 0)
@ApiModelProperty(value = "序号")
private Integer index;
@ExcelIgnore @ExcelIgnore
@ApiModelProperty(value = "组织编码") @ApiModelProperty(value = "组织编码")
private String systemCode; private String systemCode;
......
...@@ -596,10 +596,12 @@ public class JpStationServiceImpl extends BaseService<JpStationDto, JpStation, J ...@@ -596,10 +596,12 @@ public class JpStationServiceImpl extends BaseService<JpStationDto, JpStation, J
public List<JpStationDto> getJpStationDtoAlldto( List<JpStationDto> da){ public List<JpStationDto> getJpStationDtoAlldto( List<JpStationDto> da){
List<JpStationDto> ld=new ArrayList<>(); List<JpStationDto> ld=new ArrayList<>();
Map<String,String> regionalCompaniesNameMap = getRegionalCompaniesNameMap(); Map<String,String> regionalCompaniesNameMap = getRegionalCompaniesNameMap();
int index=0;
for (JpStationDto jpStation : da) { for (JpStationDto jpStation : da) {
JpStationDto hd=new JpStationDto(); JpStationDto hd=new JpStationDto();
hd.setSequenceNbr(jpStation.getSequenceNbr()); hd.setSequenceNbr(jpStation.getSequenceNbr());
hd.setCode(jpStation.getCode()); hd.setCode(jpStation.getCode());
hd.setIndex(index++);
hd.setName(jpStation.getName()); hd.setName(jpStation.getName());
hd.setUserName(jpStation.getUserName()); hd.setUserName(jpStation.getUserName());
hd.setStationContact(jpStation.getStationContact()); hd.setStationContact(jpStation.getStationContact());
...@@ -620,10 +622,11 @@ public class JpStationServiceImpl extends BaseService<JpStationDto, JpStation, J ...@@ -620,10 +622,11 @@ public class JpStationServiceImpl extends BaseService<JpStationDto, JpStation, J
List<JpStationDto> ld = new ArrayList<>(); List<JpStationDto> ld = new ArrayList<>();
Map<String, String> regionalCompaniesNameMap = getRegionalCompaniesNameMap(); Map<String, String> regionalCompaniesNameMap = getRegionalCompaniesNameMap();
Integer index=0;
for (JpStation jpStation : da) { for (JpStation jpStation : da) {
JpStationDto hd = new JpStationDto(); JpStationDto hd = new JpStationDto();
hd.setSequenceNbr(jpStation.getSequenceNbr()); hd.setSequenceNbr(jpStation.getSequenceNbr());
hd.setCode(jpStation.getCode()); hd.setIndex(index++);
hd.setName(jpStation.getName()); hd.setName(jpStation.getName());
hd.setUserName(jpStation.getUserName()); hd.setUserName(jpStation.getUserName());
hd.setStationContact(jpStation.getStationContact()); hd.setStationContact(jpStation.getStationContact());
......
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