From 145580fd820bb31334f2e71643413e846b7ce904 Mon Sep 17 00:00:00 2001
From: shiyunteng <shiyunteng@example.com>
Date: 星期五, 30 十月 2026 15:53:20 +0800
Subject: [PATCH] feat:统计内容1-8页
---
platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ContractServiceImpl.java | 26 ++++++++++++++++++++++----
1 files changed, 22 insertions(+), 4 deletions(-)
diff --git a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ContractServiceImpl.java b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ContractServiceImpl.java
index 4019a40..39a96c3 100644
--- a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ContractServiceImpl.java
+++ b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ContractServiceImpl.java
@@ -565,7 +565,15 @@
requestApply.put("fd_customerName", contract.getPartyA());
requestApply.put("fd_systemSource", "闈炵叅閿�鍞郴缁�");
requestApply.put("fd_type", "00");
- requestApply.put("fd_baozhangren", comp.getBaozhangren());
+ String bzr = comp.getBaozhangren();
+ String syr = baseMapper.selectYZSH();
+ if (!StrUtil.equals(contract.getCompId()+"",contract.getPartyBId()+"")&& (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjsc) ||
+ StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjzt)||
+ StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjhw))&&StrUtil.isNotBlank(syr)) {
+ log.info("鐭崇叅鏈哄瓙鍏徃鐢ㄦ�诲叕鍙稿嵃绔�");
+ bzr =bzr.concat(syr);
+ }
+ requestApply.put("fd_baozhangren", bzr);
requestApply.put("fd_summary",contract.getSummary());
JSONArray signList = new JSONArray();
JSONObject j = new JSONObject();
@@ -794,7 +802,8 @@
baseMapper.updateById(contract);
}
- if ((StrUtil.equals(contract.getPartyBId() + "", smj) ||
+ if ((StrUtil.equals(contract.getPartyBId() + "", smj) ||StrUtil.equals(contract.getPartyBId() + "", smjsc) ||
+ StrUtil.equals(contract.getPartyBId() + "", smjzt) ||
StrUtil.equals(contract.getPartyBId() + "", smjhw)) && StrUtil.isNotEmpty(smjErp)) {
request.put("customerCode", customer.getErpCompanyCode());
request.put("currencyId", "RMB");
@@ -812,8 +821,17 @@
subjectMatterItem.put("salePrice", contractSubjectMatter.getUnitPrice());
subjectMatterItem.put("qtyRequired", contractSubjectMatter.getQuantity());
subjectMatterItem.put("money", contractSubjectMatter.getQuantity().multiply(contractSubjectMatter.getUnitPrice()));
- Product product = productMapper.selectOne(Wrappers.<Product>lambdaQuery().eq(Product::getCompId, contract.getCompId())
- .eq(Product::getErpCode, contractSubjectMatter.getMaterialCode()));
+ Product product = null;
+ List<String> smjList = new ArrayList<>();
+ smjList.add(smj);
+ smjList.add(smjhw);
+ if (("" + SecurityUtils.getUser().getCompId()).equals(smj)||("" + SecurityUtils.getUser().getCompId()).equals(smjhw)) {
+ product = productMapper.selectOne(Wrappers.<Product>lambdaQuery().eq(Product::getErpCode, contractSubjectMatter.getMaterialCode())
+ .in(Product::getCompId, smjList).last("limit 1"));
+ } else {
+ product = productMapper.selectOne(Wrappers.<Product>lambdaQuery().eq(Product::getErpCode, contractSubjectMatter.getMaterialCode())
+ .eq(Product::getCompId, SecurityUtils.getUser().getCompId()).last("limit 1"));
+ }
if (ObjUtil.isNotNull(product)) {
subjectMatterItem.put("taxRate", new BigDecimal(product.getTaxRate()).divide(new BigDecimal("100")));
}
--
Gitblit v1.9.1