Skip to content
Toggle navigation
Projects
Groups
Snippets
Help
Toggle navigation
This project
Loading...
Sign in
李苗
/
Vion-DevOps
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit a522eaa1
authored
Dec 11, 2024
by
HlQ
Browse Files
Options
Browse Files
Tag
Download
Email Patches
Plain Diff
[add] 项目管理列表返回合同产品信息,不显示金额
1 parent
6277fc51
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
15 additions
and
6 deletions
src/main/java/vion/service/impl/ContractServiceImpl.java
src/main/java/vion/service/impl/ContractServiceImpl.java
View file @
a522eaa
...
...
@@ -246,6 +246,11 @@ public class ContractServiceImpl extends MPJBaseServiceImpl<ContractMapper, Cont
.
leftJoin
(
ContractLog
.
class
,
ContractLog:
:
getContractNo
,
Contract:
:
getContractNo
)
.
eq
(
Contract:
:
getId
,
id
);
ContractVO
contractVO
=
this
.
selectJoinOne
(
ContractVO
.
class
,
wrapper
);
// 合同关联产品
var
contractProducts
=
contractProductService
.
lambdaQuery
()
.
eq
(
RContractProduct:
:
getContractNo
,
contractVO
.
getContractNo
())
.
list
();
// 不是这三个角色,不返回金额信息
// 是这三个角色任意角色返回合同详情的产品信息
if
(!
roleCodeList
.
contains
(
"admin"
)
&&
!
roleCodeList
.
contains
(
"xiaoshou"
)
&&
!
roleCodeList
.
contains
(
"caiwu"
))
{
...
...
@@ -254,13 +259,17 @@ public class ContractServiceImpl extends MPJBaseServiceImpl<ContractMapper, Cont
contractVO
.
setReceivableAmount
(
null
);
contractVO
.
setOutstandingAmount
(
null
);
contractVO
.
setInvoiceAmount
(
null
);
}
else
{
// 合同关联产品
var
contractProducts
=
contractProductService
.
lambdaQuery
()
.
eq
(
RContractProduct:
:
getContractNo
,
contractVO
.
getContractNo
())
.
list
();
contractVO
.
setContractProducts
(
contractProducts
);
contractProducts
.
forEach
(
v
->
{
v
.
setTaxPrice
(
null
);
v
.
setTaxRate
(
null
);
v
.
setNoTaxPrice
(
null
);
v
.
setDiscountRate
(
null
);
v
.
setActualPrice
(
null
);
v
.
setErase
(
null
);
v
.
setTotalPrice
(
null
);
});
}
contractVO
.
setContractProducts
(
contractProducts
);
// 合同绑定销售
Opt
.
ofEmptyAble
(
contractUserService
.
lambdaQuery
().
eq
(
RContractUser:
:
getContractId
,
contractVO
.
getId
()).
list
())
...
...
Write
Preview
Markdown
is supported
Attach a file
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 post a comment