Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
amos-boot-biz
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
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
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
项目统一框架
amos-boot-biz
Commits
fca38276
Commit
fca38276
authored
Sep 22, 2023
by
caotao
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改户用光伏导出功率不正常问题
parent
fead3f69
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
2 deletions
+8
-2
HouseholdPvController.java
...ot/module/jxiop/biz/controller/HouseholdPvController.java
+8
-2
No files found.
amos-boot-system-jxiop/amos-boot-module-jxiop-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/HouseholdPvController.java
View file @
fca38276
...
...
@@ -257,8 +257,14 @@ public class HouseholdPvController extends BaseController {
row
.
createCell
(
4
).
setCellValue
(
ObjectUtils
.
isEmpty
(
item
.
getPhone
())
?
""
:
item
.
getPhone
());
row
.
createCell
(
5
).
setCellValue
(
ObjectUtils
.
isEmpty
(
item
.
getInstallAddress
())
?
""
:
item
.
getInstallAddress
());
// 安装总功率
if
(!
ObjectUtils
.
isEmpty
(
item
)&&
!
ObjectUtils
.
isEmpty
(
item
.
getActualCapacity
())
&&
!
ObjectUtils
.
isEmpty
(
item
.
getInstallCount
()))
{
long
multiplyExact
=
Math
.
multiplyExact
(
Long
.
parseLong
(
item
.
getActualCapacity
()),
Long
.
parseLong
(
item
.
getInstallCount
()));
//updateTime: 2023年9月22日 14点26分
//desc:客户提出导出时该值由原来的 预计功率*安装数量 修改为 组件单片功率 * 安装数量
//changer: 曹涛
// if (!ObjectUtils.isEmpty(item)&& !ObjectUtils.isEmpty(item.getActualCapacity()) && !ObjectUtils.isEmpty(item.getInstallCount())) {
// long multiplyExact = Math.multiplyExact(Long.parseLong(item.getActualCapacity()), Long.parseLong(item.getInstallCount()));
// row.createCell(6).setCellValue(String.valueOf(multiplyExact));
if
(!
ObjectUtils
.
isEmpty
(
item
)&&
!
ObjectUtils
.
isEmpty
(
item
.
getMonolithicPower
())
&&
!
ObjectUtils
.
isEmpty
(
item
.
getInstallCount
()))
{
long
multiplyExact
=
Math
.
multiplyExact
(
Long
.
parseLong
(
item
.
getMonolithicPower
()),
Long
.
parseLong
(
item
.
getInstallCount
()));
row
.
createCell
(
6
).
setCellValue
(
String
.
valueOf
(
multiplyExact
));
}
else
{
row
.
createCell
(
6
).
setCellValue
(
0
);
...
...
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