Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
amos-boot-zx-biz
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Jobs
Commits
Open sidebar
项目统一框架
一体化_户用光伏项目代码
amos-boot-zx-biz
Commits
e2eca41b
Commit
e2eca41b
authored
Dec 23, 2024
by
hezhuozhi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修复电站监控报表导出和展示不一致
parent
db469fb2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
3 deletions
+7
-3
JpStationDto.java
...m/yeejoin/amos/boot/module/hygf/api/dto/JpStationDto.java
+3
-2
JpStationServiceImpl.java
...ot/module/hygf/biz/service/impl/JpStationServiceImpl.java
+4
-1
No files found.
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/JpStationDto.java
View file @
e2eca41b
...
...
@@ -36,9 +36,10 @@ public class JpStationDto extends BaseDto {
@ExcelProperty
(
value
=
"电站名称"
,
index
=
1
)
@ApiModelProperty
(
value
=
"电站名称"
)
private
String
name
;
@ExcelProperty
(
value
=
"电站编号"
,
index
=
0
)
@ApiModelProperty
(
value
=
"电站编码"
)
private
String
code
;
@ExcelProperty
(
value
=
"序号"
,
index
=
0
)
@ApiModelProperty
(
value
=
"序号"
)
private
Integer
index
;
@ExcelIgnore
@ApiModelProperty
(
value
=
"组织编码"
)
private
String
systemCode
;
...
...
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/JpStationServiceImpl.java
View file @
e2eca41b
...
...
@@ -596,10 +596,12 @@ public class JpStationServiceImpl extends BaseService<JpStationDto, JpStation, J
public
List
<
JpStationDto
>
getJpStationDtoAlldto
(
List
<
JpStationDto
>
da
){
List
<
JpStationDto
>
ld
=
new
ArrayList
<>();
Map
<
String
,
String
>
regionalCompaniesNameMap
=
getRegionalCompaniesNameMap
();
int
index
=
0
;
for
(
JpStationDto
jpStation
:
da
)
{
JpStationDto
hd
=
new
JpStationDto
();
hd
.
setSequenceNbr
(
jpStation
.
getSequenceNbr
());
hd
.
setCode
(
jpStation
.
getCode
());
hd
.
setIndex
(
index
++);
hd
.
setName
(
jpStation
.
getName
());
hd
.
setUserName
(
jpStation
.
getUserName
());
hd
.
setStationContact
(
jpStation
.
getStationContact
());
...
...
@@ -620,10 +622,11 @@ public class JpStationServiceImpl extends BaseService<JpStationDto, JpStation, J
List
<
JpStationDto
>
ld
=
new
ArrayList
<>();
Map
<
String
,
String
>
regionalCompaniesNameMap
=
getRegionalCompaniesNameMap
();
Integer
index
=
0
;
for
(
JpStation
jpStation
:
da
)
{
JpStationDto
hd
=
new
JpStationDto
();
hd
.
setSequenceNbr
(
jpStation
.
getSequenceNbr
());
hd
.
set
Code
(
jpStation
.
getCode
()
);
hd
.
set
Index
(
index
++
);
hd
.
setName
(
jpStation
.
getName
());
hd
.
setUserName
(
jpStation
.
getUserName
());
hd
.
setStationContact
(
jpStation
.
getStationContact
());
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment