Skip to content

李苗 / Vion-DevOps

Go to a project
Commit a522eaa1 by HlQ
Options

[add] 项目管理列表返回合同产品信息，不显示金额

1 parent 6277fc51
Inline Side-by-side
Showing 1 changed file with 15 additions and 6 deletions
src/main/java/vion/service/impl/ContractServiceImpl.java
...@@ -246,6 +246,11 @@ public class ContractServiceImpl extends MPJBaseServiceImpl<ContractMapper, Cont ...@@ -246,6 +246,11 @@ public class ContractServiceImpl extends MPJBaseServiceImpl<ContractMapper, Cont
.leftJoin(ContractLog.class, ContractLog::getContractNo, Contract::getContractNo) .leftJoin(ContractLog.class, ContractLog::getContractNo, Contract::getContractNo)
.eq(Contract::getId, id); .eq(Contract::getId, id);
ContractVO contractVO = this.selectJoinOne(ContractVO.class, wrapper); 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")) { if (!roleCodeList.contains("admin") && !roleCodeList.contains("xiaoshou") && !roleCodeList.contains("caiwu")) {
...@@ -254,13 +259,17 @@ public class ContractServiceImpl extends MPJBaseServiceImpl<ContractMapper, Cont ...@@ -254,13 +259,17 @@ public class ContractServiceImpl extends MPJBaseServiceImpl<ContractMapper, Cont
contractVO.setReceivableAmount(null); contractVO.setReceivableAmount(null);
contractVO.setOutstandingAmount(null); contractVO.setOutstandingAmount(null);
contractVO.setInvoiceAmount(null); contractVO.setInvoiceAmount(null);
} else { contractProducts.forEach(v -> {
// 合同关联产品 v.setTaxPrice(null);
var contractProducts = contractProductService.lambdaQuery() v.setTaxRate(null);
.eq(RContractProduct::getContractNo, contractVO.getContractNo()) v.setNoTaxPrice(null);
.list(); v.setDiscountRate(null);
contractVO.setContractProducts(contractProducts); v.setActualPrice(null);
v.setErase(null);
v.setTotalPrice(null);
});
} }
contractVO.setContractProducts(contractProducts);
// 合同绑定销售 // 合同绑定销售
Opt.ofEmptyAble(contractUserService.lambdaQuery().eq(RContractUser::getContractId, contractVO.getId()).list()) Opt.ofEmptyAble(contractUserService.lambdaQuery().eq(RContractUser::getContractId, contractVO.getId()).list())
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!