Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
R
ry-crm
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
田光明
ry-crm
Commits
11eb2ec7
Commit
11eb2ec7
authored
Feb 21, 2025
by
EDY
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bug
parent
9f42d2b8
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
5 deletions
+5
-5
ContractCollectVo.java
...om/ruoyi/system/domain/business/vo/ContractCollectVo.java
+4
-4
BaseContractInfoServiceImpl.java
...em/service/business/impl/BaseContractInfoServiceImpl.java
+1
-1
No files found.
ruoyi-system/src/main/java/com/ruoyi/system/domain/business/vo/ContractCollectVo.java
View file @
11eb2ec7
...
...
@@ -9,14 +9,14 @@ import java.math.BigDecimal;
public
class
ContractCollectVo
{
// 合同总额
private
BigDecimal
contractAmount
;
private
BigDecimal
contractAmount
=
BigDecimal
.
ZERO
;
// 到账金额
private
BigDecimal
toTheAmount
;
private
BigDecimal
toTheAmount
=
BigDecimal
.
ZERO
;
// 待收款金额
private
BigDecimal
payeeAmount
;
private
BigDecimal
payeeAmount
=
BigDecimal
.
ZERO
;
// 开票金额
private
BigDecimal
makeInvoiceAmount
;
private
BigDecimal
makeInvoiceAmount
=
BigDecimal
.
ZERO
;
}
ruoyi-system/src/main/java/com/ruoyi/system/service/business/impl/BaseContractInfoServiceImpl.java
View file @
11eb2ec7
...
...
@@ -152,7 +152,7 @@ public class BaseContractInfoServiceImpl implements IBaseContractInfoService {
@Override
public
ContractCollectVo
getCollect
()
{
ContractCollectVo
contractCollectVo
=
baseContractInfoMapper
.
queryContractAmount
();
if
(
contractCollectVo
.
getContractAmount
()
!=
null
&&
contractCollectVo
.
getToTheAmount
()
!=
null
)
{
if
(
contractCollectVo
!=
null
&&
contractCollectVo
.
getContractAmount
()
!=
null
&&
contractCollectVo
.
getToTheAmount
()
!=
null
)
{
contractCollectVo
.
setPayeeAmount
(
contractCollectVo
.
getContractAmount
().
subtract
(
contractCollectVo
.
getToTheAmount
()));
}
BigDecimal
invoiceAmount
=
baseInvoiceInfoMapper
.
queryInvoiceAmount
();
...
...
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