Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
D
dsk-operate-sys-cscec
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
fulixin
dsk-operate-sys-cscec
Commits
df73e992
Commit
df73e992
authored
Mar 27, 2024
by
chenyuefang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update
parent
0e22c1f5
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
12 deletions
+13
-12
CbSummaryActualListVo.java
...n/java/com/dsk/cscec/domain/vo/CbSummaryActualListVo.java
+5
-4
CbSummaryServiceImpl.java
...java/com/dsk/cscec/service/impl/CbSummaryServiceImpl.java
+8
-8
No files found.
dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/domain/vo/CbSummaryActualListVo.java
View file @
df73e992
...
@@ -69,19 +69,20 @@ public class CbSummaryActualListVo extends BaseEntity {
...
@@ -69,19 +69,20 @@ public class CbSummaryActualListVo extends BaseEntity {
/**
/**
* 本月费用(含税)
* 本月费用(含税)
*/
*/
private
BigDecimal
taxInclusiveExpense
;
private
Double
taxInclusiveExpense
;
/**
/**
* 本月费用(不含税)
* 本月费用(不含税)
*/
*/
private
BigDecimal
taxExclusiveExpense
;
private
Double
taxExclusiveExpense
;
/**
/**
* 截至本月费用(含税)
* 截至本月费用(含税)
*/
*/
private
BigDecimal
taxInclusiveExpenseTotal
;
private
Double
taxInclusiveExpenseTotal
;
/**
/**
* 截至本月费用(不含税)
* 截至本月费用(不含税)
*/
*/
private
BigDecimal
taxExclusiveExpenseTotal
;
private
Double
taxExclusiveExpenseTotal
;
/**
/**
* 费用日期
* 费用日期
*/
*/
...
...
dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/service/impl/CbSummaryServiceImpl.java
View file @
df73e992
...
@@ -331,15 +331,15 @@ public class CbSummaryServiceImpl extends ServiceImpl<CbSummaryMapper, CbSummary
...
@@ -331,15 +331,15 @@ public class CbSummaryServiceImpl extends ServiceImpl<CbSummaryMapper, CbSummary
}
}
//截至本月费用汇总
//截至本月费用汇总
Map
<
String
,
BigDecimal
>
parentTotal
=
cbSummaryActualMapper
.
getTotal
(
cbSummaryActualListVo
.
getId
(),
bo
.
getExpenseDate
());
Map
<
String
,
BigDecimal
>
parentTotal
=
cbSummaryActualMapper
.
getTotal
(
cbSummaryActualListVo
.
getId
(),
bo
.
getExpenseDate
());
cbSummaryActualListVo
.
setTaxExclusiveExpenseTotal
(
parentTotal
.
get
(
"taxExclusiveExpenseTotal"
));
cbSummaryActualListVo
.
setTaxExclusiveExpenseTotal
(
parentTotal
.
get
(
"taxExclusiveExpenseTotal"
)
.
doubleValue
()
);
cbSummaryActualListVo
.
setTaxInclusiveExpenseTotal
(
parentTotal
.
get
(
"taxInclusiveExpenseTotal"
));
cbSummaryActualListVo
.
setTaxInclusiveExpenseTotal
(
parentTotal
.
get
(
"taxInclusiveExpenseTotal"
)
.
doubleValue
()
);
List
<
CbSummaryActualListVo
>
childrenList
=
baseMapper
.
getByParentId
(
bo
.
getId
(),
bo
.
getExpenseDate
());
List
<
CbSummaryActualListVo
>
childrenList
=
baseMapper
.
getByParentId
(
bo
.
getId
(),
bo
.
getExpenseDate
());
//截至本月费用汇总
//截至本月费用汇总
childrenList
.
parallelStream
().
forEach
(
children
->
{
childrenList
.
parallelStream
().
forEach
(
children
->
{
Map
<
String
,
BigDecimal
>
total
=
cbSummaryActualMapper
.
getTotal
(
children
.
getId
(),
bo
.
getExpenseDate
());
Map
<
String
,
BigDecimal
>
total
=
cbSummaryActualMapper
.
getTotal
(
children
.
getId
(),
bo
.
getExpenseDate
());
children
.
setTaxExclusiveExpenseTotal
(
total
.
get
(
"taxExclusiveExpenseTotal"
));
children
.
setTaxExclusiveExpenseTotal
(
total
.
get
(
"taxExclusiveExpenseTotal"
)
.
doubleValue
()
);
children
.
setTaxInclusiveExpenseTotal
(
total
.
get
(
"taxInclusiveExpenseTotal"
));
children
.
setTaxInclusiveExpenseTotal
(
total
.
get
(
"taxInclusiveExpenseTotal"
)
.
doubleValue
()
);
});
});
if
(
CollectionUtil
.
isNotEmpty
(
childrenList
))
{
if
(
CollectionUtil
.
isNotEmpty
(
childrenList
))
{
cbSummaryActualListVo
.
setHasChildren
(
1
);
cbSummaryActualListVo
.
setHasChildren
(
1
);
...
@@ -391,8 +391,8 @@ public class CbSummaryServiceImpl extends ServiceImpl<CbSummaryMapper, CbSummary
...
@@ -391,8 +391,8 @@ public class CbSummaryServiceImpl extends ServiceImpl<CbSummaryMapper, CbSummary
children
.
setChildren
(
getProjectSumList
(
childBo
));
children
.
setChildren
(
getProjectSumList
(
childBo
));
//截至本月费用汇总
//截至本月费用汇总
Map
<
String
,
BigDecimal
>
total
=
cbSummaryActualMapper
.
getTotal
(
children
.
getId
(),
bo
.
getExpenseDate
());
Map
<
String
,
BigDecimal
>
total
=
cbSummaryActualMapper
.
getTotal
(
children
.
getId
(),
bo
.
getExpenseDate
());
children
.
setTaxExclusiveExpenseTotal
(
total
.
get
(
"taxExclusiveExpenseTotal"
));
children
.
setTaxExclusiveExpenseTotal
(
total
.
get
(
"taxExclusiveExpenseTotal"
)
.
doubleValue
()
);
children
.
setTaxInclusiveExpenseTotal
(
total
.
get
(
"taxInclusiveExpenseTotal"
));
children
.
setTaxInclusiveExpenseTotal
(
total
.
get
(
"taxInclusiveExpenseTotal"
)
.
doubleValue
()
);
});
});
return
childrenList
;
return
childrenList
;
...
@@ -533,8 +533,8 @@ public class CbSummaryServiceImpl extends ServiceImpl<CbSummaryMapper, CbSummary
...
@@ -533,8 +533,8 @@ public class CbSummaryServiceImpl extends ServiceImpl<CbSummaryMapper, CbSummary
//截至本月费用汇总
//截至本月费用汇总
resultList
.
forEach
(
cbSummaryActualListVo
->
{
resultList
.
forEach
(
cbSummaryActualListVo
->
{
Map
<
String
,
BigDecimal
>
total
=
cbSummaryActualMapper
.
getTotal
(
cbSummaryActualListVo
.
getId
(),
bo
.
getExpenseDate
());
Map
<
String
,
BigDecimal
>
total
=
cbSummaryActualMapper
.
getTotal
(
cbSummaryActualListVo
.
getId
(),
bo
.
getExpenseDate
());
cbSummaryActualListVo
.
setTaxExclusiveExpenseTotal
(
total
.
get
(
"taxExclusiveExpenseTotal"
));
cbSummaryActualListVo
.
setTaxExclusiveExpenseTotal
(
total
.
get
(
"taxExclusiveExpenseTotal"
)
.
doubleValue
()
);
cbSummaryActualListVo
.
setTaxInclusiveExpenseTotal
(
total
.
get
(
"taxInclusiveExpenseTotal"
));
cbSummaryActualListVo
.
setTaxInclusiveExpenseTotal
(
total
.
get
(
"taxInclusiveExpenseTotal"
)
.
doubleValue
()
);
});
});
return
resultList
;
return
resultList
;
}
}
...
...
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