From c5c284896ce6428cffc5092e9cdef4fefc23409f Mon Sep 17 00:00:00 2001
From: shiyunteng <shiyunteng@example.com>
Date: 星期五, 18 九月 2026 17:12:49 +0800
Subject: [PATCH] feat: 石煤机客商产品查询处理 合同推送新增选商方式和是否关联交易
---
platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/BusinessCustomerController.java | 47 +++++++
platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/StatisticServiceImpl.java | 133 +++++++++++----------
platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/Contract.java | 8 +
platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/ProductController.java | 38 ++++++
platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ContractServiceImpl.java | 65 ++++++++++
platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/dto/ContractAddDTO.java | 6 +
platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/ContractDetailVo.java | 6 +
7 files changed, 237 insertions(+), 66 deletions(-)
diff --git a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/dto/ContractAddDTO.java b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/dto/ContractAddDTO.java
index 355ad17..41fc932 100644
--- a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/dto/ContractAddDTO.java
+++ b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/dto/ContractAddDTO.java
@@ -260,6 +260,12 @@
@Schema(description = "寮�绁ㄩ噾棰�")
private BigDecimal billingAmout;
+ @Schema(description = "閫夊晢鏂瑰紡")
+ private String selectionMethod;
+
+ @Schema(description = "鏄惁鍏宠仈浜ゆ槗")
+ private String isRelated;
+
private List<ContractPaymentScheduleAddDTO> contractPaymentSchedule;
private List<ContractSubjectMatterAddDTO> contractSubjectMatter;
diff --git a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/Contract.java b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/Contract.java
index 07ee1d7..a600782 100644
--- a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/Contract.java
+++ b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/Contract.java
@@ -418,4 +418,12 @@
@Schema(description = "鎹熷け閲戦")
@Column(columnDefinition = "decimal(10,2) DEFAULT '0.00' comment '鎹熷け閲戦'")
private BigDecimal dropAmount;
+
+ @Schema(description = "閫夊晢鏂瑰紡")
+ @Column(columnDefinition = "VARCHAR(50) comment '閫夊晢鏂瑰紡'")
+ private String selectionMethod;
+
+ @Schema(description = "鏄惁鍏宠仈浜ゆ槗")
+ @Column(name = "is_related",columnDefinition = "VARCHAR(50) comment '鏄惁鍏宠仈浜ゆ槗'")
+ private String isRelated;
}
diff --git a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/ContractDetailVo.java b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/ContractDetailVo.java
index 45dbc4b..8debb3b 100644
--- a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/ContractDetailVo.java
+++ b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/ContractDetailVo.java
@@ -251,6 +251,12 @@
private BigDecimal paidAmount;
+ @Schema(description = "閫夊晢鏂瑰紡")
+ private String selectionMethod;
+
+ @Schema(description = "鏄惁鍏宠仈浜ゆ槗")
+ private String isRelated;
+
private ContractInvoiceBipVo bipVo;
private List<ContractPaymentSchedule> contractPaymentSchedule;
diff --git a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/BusinessCustomerController.java b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/BusinessCustomerController.java
index db0ce40..3bbda0d 100644
--- a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/BusinessCustomerController.java
+++ b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/BusinessCustomerController.java
@@ -7,12 +7,15 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.by4cloud.platformx.business.entity.Product;
import com.by4cloud.platformx.business.vo.BusinessCustomerSelectVo;
import com.by4cloud.platformx.common.core.util.R;
import com.by4cloud.platformx.common.log.annotation.SysLog;
import com.by4cloud.platformx.business.entity.BusinessCustomer;
import com.by4cloud.platformx.business.service.BusinessCustomerService;
import com.by4cloud.platformx.common.security.annotation.Inner;
+import com.by4cloud.platformx.common.security.util.SecurityUtils;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.security.access.prepost.PreAuthorize;
import com.by4cloud.platformx.common.excel.annotation.ResponseExcel;
import io.swagger.v3.oas.annotations.security.SecurityRequirement;
@@ -23,6 +26,7 @@
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.*;
+import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
@@ -41,6 +45,15 @@
private final BusinessCustomerService businessCustomerService;
+ @Value("${dept.smj}")
+ private String smj;
+
+ @Value("${dept.smjsc}")
+ private String smjsc;
+
+ @Value("${dept.smjzt}")
+ private String smjzt;
+
/**
* 鍒嗛〉鏌ヨ
* @param page 鍒嗛〉瀵硅薄
@@ -51,6 +64,21 @@
@GetMapping("/page" )
@PreAuthorize("@pms.hasPermission('business_businessCustomer_view')" )
public R getBusinessCustomerPage(@ParameterObject Page page, @ParameterObject BusinessCustomer businessCustomer) {
+
+ if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smj) || StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjsc) ||
+ StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjzt)) {
+ LambdaQueryWrapper<BusinessCustomer> wrapper = Wrappers.lambdaQuery();
+ wrapper.eq(businessCustomer.getIndustryId()!=null,BusinessCustomer::getIndustryId,businessCustomer.getIndustryId());
+ wrapper.eq(businessCustomer.getAreaId()!=null,BusinessCustomer::getAreaId,businessCustomer.getAreaId());
+ wrapper.like(StrUtil.isNotEmpty(businessCustomer.getCompanyName()),BusinessCustomer::getCompanyName,businessCustomer.getCompanyName());
+ List<String> smjList = new ArrayList<>();
+ smjList.add(smj);
+ smjList.add(smjsc);
+ smjList.add(smjzt);
+ wrapper.in(BusinessCustomer::getCompId, smjList);
+ wrapper.orderByDesc(BusinessCustomer::getCreateTime);
+ return R.ok(businessCustomerService.page(page, wrapper));
+ }
LambdaQueryWrapper<BusinessCustomer> wrapper = Wrappers.lambdaQuery();
wrapper.eq(businessCustomer.getIndustryId()!=null,BusinessCustomer::getIndustryId,businessCustomer.getIndustryId());
wrapper.eq(businessCustomer.getAreaId()!=null,BusinessCustomer::getAreaId,businessCustomer.getAreaId());
@@ -68,6 +96,25 @@
@GetMapping("/list" )
@PreAuthorize("@pms.hasPermission('business_businessCustomer_view')" )
public R getBusinessCustomerList(@ParameterObject BusinessCustomer businessCustomer) {
+
+ if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smj) || StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjsc) ||
+ StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjzt)) {
+ LambdaQueryWrapper<BusinessCustomer> wrapper = Wrappers.lambdaQuery();
+ wrapper.like(StrUtil.isNotEmpty(businessCustomer.getCompanyName()),BusinessCustomer::getCompanyName,businessCustomer.getCompanyName());
+ List<String> smjList = new ArrayList<>();
+ smjList.add(smj);
+ smjList.add(smjsc);
+ smjList.add(smjzt);
+ wrapper.in(BusinessCustomer::getCompId, smjList);
+ List<BusinessCustomer> businessCustomerList = businessCustomerService.list(wrapper);
+ if (CollUtil.isNotEmpty(businessCustomerList)){
+ List<BusinessCustomerSelectVo> voList = BeanUtil.copyToList(businessCustomerList, BusinessCustomerSelectVo.class);
+ if (voList.size()>1000){
+ return R.ok(voList.subList(0,1000));
+ }
+ return R.ok(voList);
+ }
+ }
LambdaQueryWrapper<BusinessCustomer> wrapper = Wrappers.lambdaQuery();
wrapper.like(StrUtil.isNotEmpty(businessCustomer.getCompanyName()),BusinessCustomer::getCompanyName,businessCustomer.getCompanyName());
List<BusinessCustomer> businessCustomerList = businessCustomerService.listByScope(wrapper);
diff --git a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/ProductController.java b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/ProductController.java
index a19180b..6994108 100644
--- a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/ProductController.java
+++ b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/ProductController.java
@@ -12,6 +12,7 @@
import com.by4cloud.platformx.business.dto.ProductAddDTO;
import com.by4cloud.platformx.business.dto.ProductQueryDTO;
import com.by4cloud.platformx.business.dto.SyncProductDTO;
+import com.by4cloud.platformx.business.entity.BusinessCustomer;
import com.by4cloud.platformx.business.vo.ProductExcelVO;
import com.by4cloud.platformx.business.vo.ProductTreeVo;
import com.by4cloud.platformx.common.core.util.R;
@@ -20,6 +21,8 @@
import com.by4cloud.platformx.business.entity.Product;
import com.by4cloud.platformx.business.service.ProductService;
import com.by4cloud.platformx.common.security.annotation.Inner;
+import com.by4cloud.platformx.common.security.util.SecurityUtils;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.security.access.prepost.PreAuthorize;
import com.by4cloud.platformx.common.excel.annotation.ResponseExcel;
import io.swagger.v3.oas.annotations.security.SecurityRequirement;
@@ -50,6 +53,15 @@
private final ProductService productService;
+ @Value("${dept.smj}")
+ private String smj;
+
+ @Value("${dept.smjsc}")
+ private String smjsc;
+
+ @Value("${dept.smjzt}")
+ private String smjzt;
+
/**
* 鍒嗛〉鏌ヨ
* @param page 鍒嗛〉瀵硅薄
@@ -60,6 +72,32 @@
@GetMapping("/page" )
@PreAuthorize("@pms.hasPermission('business_product_view')" )
public R getProductPage(@ParameterObject Page page, @ParameterObject Product product) {
+ if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smj) || StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjsc) ||
+ StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjzt)) {
+ LambdaQueryWrapper<Product> wrapper = Wrappers.lambdaQuery();
+ wrapper.eq(product.getParentId()!=null,Product::getParentId,product.getParentId());
+ wrapper.like(StrUtil.isNotEmpty(product.getProductName()),Product::getProductName,product.getProductName());
+ wrapper.like(StrUtil.isNotEmpty(product.getMainCode()),Product::getMainCode,product.getMainCode());
+ wrapper.like(StrUtil.isNotEmpty(product.getErpCode()),Product::getErpCode,product.getErpCode());
+ List<String> smjList = new ArrayList<>();
+ smjList.add(smj);
+ smjList.add(smjsc);
+ smjList.add(smjzt);
+ wrapper.in(Product::getCompId, smjList);
+ wrapper.orderByDesc(Product::getCreateTime);
+ Page<Product> page1 = productService.page(page, wrapper);
+ List<Product> list = page1.getRecords();
+ for(Product product1 : list){
+ Product parent = productService.getById(product1.getParentId());
+ if(parent==null){
+ product1.setParentName("鏍圭骇浜у搧");
+ }else {
+ product1.setParentName(parent.getProductName());
+ }
+ }
+ page1.setRecords(list);
+ return R.ok(page1);
+ }
LambdaQueryWrapper<Product> wrapper = Wrappers.lambdaQuery();
wrapper.eq(product.getParentId()!=null,Product::getParentId,product.getParentId());
wrapper.like(StrUtil.isNotEmpty(product.getProductName()),Product::getProductName,product.getProductName());
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 de4258f..c14554a 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
@@ -489,7 +489,16 @@
Contract contract = baseMapper.selectById(id);
+ BusinessCustomer customer = businessCustomerMapper.selectById(contract.getPartyAId());
+ if (ObjUtil.isNull(customer)){
+ return R.failed("瀹㈡埛鏌ヨ寮傚父");
+ }
+ R<SysDept> r = remoteDeptService.getById(SecurityUtils.getUser().getCompId());
+ if (!r.isOk()){
+ return R.failed("淇℃伅鏌ヨ寮傚父");
+ }
+ SysDept comp = r.getData();
//绠�鏄撳悎鍚屾棤娉曠户缁悗缁搷浣�
if (StrUtil.equals(contract.getContractCategory(), "simple")) {
return R.failed("璇疯ˉ鍏呮爣鐨勭墿鍜屾敹娆鹃樁娈靛悗鍐嶈繘琛屾搷浣滐紒");
@@ -498,8 +507,8 @@
eq(ContractSubjectMatter::getContractId,contract.getId()));
//鍚堝悓涓績瀹℃牳
JSONObject requestApply = new JSONObject();
- requestApply.put("fd_selectionmethod", "鍏紑鎷涙爣");
- requestApply.put("fd_isrelated", "鏄�");
+ requestApply.put("fd_selectionmethod", contract.getSelectionMethod());
+ requestApply.put("fd_isrelated", contract.getIsRelated());
requestApply.put("fd_bizId", contract.getId());
requestApply.put("fd_remark", contract.getRemark());
requestApply.put("fd_MainContent", "");
@@ -539,6 +548,26 @@
requestApply.put("fd_customerName", contract.getPartyA());
requestApply.put("fd_systemSource", "闈炵叅閿�鍞郴缁�");
requestApply.put("fd_type", "00");
+ JSONArray signList = new JSONArray();
+ JSONObject j = new JSONObject();
+ j.put("fd_standing","鐢�");
+ j.put("fd_Iden",customer.getCreditCode());
+ j.put("fd_signMain","2");
+ signList.add(j);
+ JSONObject y = new JSONObject();
+ y.put("fd_standing","鐢�");
+ y.put("fd_Iden",comp.getOrgCode());
+ y.put("fd_signMain","1");
+ signList.add(y);
+ requestApply.put("fd_signList", signList);
+ JSONArray attList = new JSONArray();
+ JSONObject att = new JSONObject();
+ att.put("fd_attNum","1");
+ att.put("fd_attName",contract.getAttachmentName());
+ att.put("fd_attQuality","00");
+ att.put("fd_attcontent",NetworkFileToBase64.convertNetworkFileToBase64("https://zbjt.res.jzeg.cn/api" + contract.getAttachmentUrl()));
+ attList.add(att);
+ requestApply.put("attList", att);
log.info("鍚堝悓涓績鍚堝悓璧疯崏鎺ュ彛鍏ュ弬锛歿}", requestApply.toJSONString());
String respApply = HttpUtil.post("https://oa.res.jzeg.cn/ekp/api/km-agreement/kmAgreementWebService/addSupplyContractApply", requestApply.toJSONString());
log.info("鍚堝悓涓績鍚堝悓璧疯崏鎺ュ彛鍥炲弬锛歿}", respApply);
@@ -2344,6 +2373,18 @@
@Override
public R pushCenter(Long id) {
Contract contract = baseMapper.selectById(id);
+
+ BusinessCustomer customer = businessCustomerMapper.selectById(contract.getPartyAId());
+ if (ObjUtil.isNull(customer)){
+ return R.failed("瀹㈡埛鏌ヨ寮傚父");
+ }
+
+ R<SysDept> r = remoteDeptService.getById(SecurityUtils.getUser().getCompId());
+ if (!r.isOk()){
+ return R.failed("淇℃伅鏌ヨ寮傚父");
+ }
+ SysDept comp = r.getData();
+
List<ContractSubjectMatter> subjectMatterList = contractSubjectMatterMapper.selectList(Wrappers.<ContractSubjectMatter>lambdaQuery()
.eq(ContractSubjectMatter::getContractId, id));
JSONObject requestApply = new JSONObject();
@@ -2386,6 +2427,26 @@
requestApply.put("fd_customerName", contract.getPartyA());
requestApply.put("fd_systemSource", "闈炵叅閿�鍞郴缁�");
requestApply.put("fd_type", "00");
+ JSONArray signList = new JSONArray();
+ JSONObject j = new JSONObject();
+ j.put("fd_standing","鐢�");
+ j.put("fd_Iden",customer.getCreditCode());
+ j.put("fd_signMain","2");
+ signList.add(j);
+ JSONObject y = new JSONObject();
+ y.put("fd_standing","鐢�");
+ y.put("fd_Iden",comp.getOrgCode());
+ y.put("fd_signMain","1");
+ signList.add(y);
+ requestApply.put("fd_signList", signList);
+ JSONArray attList = new JSONArray();
+ JSONObject att = new JSONObject();
+ att.put("fd_attNum","1");
+ att.put("fd_attName",contract.getAttachmentName());
+ att.put("fd_attQuality","00");
+ att.put("fd_attcontent",NetworkFileToBase64.convertNetworkFileToBase64("https://zbjt.res.jzeg.cn/api" + contract.getAttachmentUrl()));
+ attList.add(att);
+ requestApply.put("attList", att);
log.info("鍚堝悓涓績鍚堝悓璧疯崏鎺ュ彛鍏ュ弬锛歿}", requestApply.toJSONString());
String respApply = HttpUtil.post("https://oa.res.jzeg.cn/ekp/api/km-agreement/kmAgreementWebService/addSupplyContractApply", requestApply.toJSONString());
log.info("鍚堝悓涓績鍚堝悓璧疯崏鎺ュ彛鍥炲弬锛歿}", respApply);
diff --git a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/StatisticServiceImpl.java b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/StatisticServiceImpl.java
index ade6a99..e2f454b 100644
--- a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/StatisticServiceImpl.java
+++ b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/StatisticServiceImpl.java
@@ -69,7 +69,6 @@
public R contractAmountAnalysis(AnalysisCommonDTO commonDTO) {
List<Long> compIds = new ArrayList<>();
compIds.add(Long.valueOf(sgb));
- compIds.add(Long.valueOf(smj));
compIds.add(Long.valueOf(tfgs));
compIds.add(Long.valueOf(ymj));
compIds.add(Long.valueOf(jxc));
@@ -477,11 +476,12 @@
return R.failed("琛屼笟瀛楀吀鍒嗙被鑾峰彇寮傚父");
}
List<Long> compIds = new ArrayList<>();
- compIds.add(Long.valueOf(sgb));
compIds.add(Long.valueOf(smj));
+ compIds.add(Long.valueOf(sgb));
+ compIds.add(Long.valueOf(jxc));
compIds.add(Long.valueOf(tfgs));
compIds.add(Long.valueOf(ymj));
- compIds.add(Long.valueOf(jxc));
+
List<AgingAnalysisVo> result = new ArrayList<>();
AgingQueryDTO queryDTO = new AgingQueryDTO();
@@ -576,11 +576,11 @@
public R agingAnalysis(AnalysisCommonDTO commonDTO) {
if (commonDTO.getAgingType().equals("2")) {
List<Long> compIds = new ArrayList<>();
- compIds.add(Long.valueOf(sgb));
compIds.add(Long.valueOf(smj));
+ compIds.add(Long.valueOf(sgb));
+ compIds.add(Long.valueOf(jxc));
compIds.add(Long.valueOf(tfgs));
compIds.add(Long.valueOf(ymj));
- compIds.add(Long.valueOf(jxc));
List<AgingAnalysisVo> result = new ArrayList<>();
AgingQueryDTO queryDTO = new AgingQueryDTO();
List<AgingVo> agingVoList = contractPaymentScheduleMapper.selectAgingTotalShip(null);
@@ -591,7 +591,7 @@
}
SysDept dept = r.getData();
AgingAnalysisVo agingAnalysisVo = new AgingAnalysisVo();
- agingAnalysisVo.setCompanyName(dept.getOrgName());
+ agingAnalysisVo.setCompanyName(dept.getName());
queryDTO.setCompanyId(dept.getDeptId());
List<AgingVo> companyAgingVo = contractPaymentScheduleMapper.selectAgingTotalShip(queryDTO);
//琛ュ叏鏁版嵁
@@ -688,7 +688,7 @@
}
SysDept dept = r.getData();
AgingAnalysisVo agingAnalysisVo = new AgingAnalysisVo();
- agingAnalysisVo.setCompanyName(dept.getOrgName());
+ agingAnalysisVo.setCompanyName(dept.getName());
queryDTO.setCompanyId(dept.getDeptId());
List<AgingVo> companyAgingVo = contractPaymentScheduleMapper.selectAgingTotalInvoice(queryDTO);
//琛ュ叏鏁版嵁
@@ -867,11 +867,12 @@
@Override
public R agingAnalysisTotalScale(AnalysisCommonDTO commonDTO) {
List<Long> compIds = new ArrayList<>();
- compIds.add(Long.valueOf(sgb));
compIds.add(Long.valueOf(smj));
+ compIds.add(Long.valueOf(sgb));
compIds.add(Long.valueOf(tfgs));
- compIds.add(Long.valueOf(ymj));
compIds.add(Long.valueOf(jxc));
+ compIds.add(Long.valueOf(ymj));
+
List<AgingAnalysisVo> result = new ArrayList<>();
AgingQueryDTO queryDTO = new AgingQueryDTO();
List<AgingVo> agingVoList = contractPaymentScheduleMapper.selectAgingTotalScale(null);
@@ -882,7 +883,7 @@
}
SysDept dept = r.getData();
AgingAnalysisVo agingAnalysisVo = new AgingAnalysisVo();
- agingAnalysisVo.setCompanyName(dept.getOrgName());
+ agingAnalysisVo.setCompanyName(dept.getName());
queryDTO.setCompanyId(dept.getDeptId());
List<AgingVo> companyAgingVo = contractPaymentScheduleMapper.selectAgingTotalScale(queryDTO);
//琛ュ叏鏁版嵁
@@ -966,95 +967,99 @@
@Override
public R homeZbjt() {
List<HomeZbjtVo> homeZbjtVoList = new ArrayList<>();
- //鍚堝悓绛捐 sgb smj jxc tfgs ymj
- HomeZbjtVo htqd = contractMapper.homeZbjt();
- homeZbjtVoList.add(htqd);
- //鍥炴
- HomeZbjtVo hk = paymentSlipMapper.homeZbjt();
- homeZbjtVoList.add(hk);
+
//鍑鸿揣
- HomeZbjtVo ch = contractOutBoundMapper.homeZbjt();
- homeZbjtVoList.add(ch);
+// HomeZbjtVo ch = contractOutBoundMapper.homeZbjt();
+// homeZbjtVoList.add(ch);
+ //鍙繚鐣欓攢鍞敹鍏� 鍥炴 鏂板鍚堝悓
//寮�绁�
HomeZbjtVo kp = contractInvoiceMapper.homeZbjt();
homeZbjtVoList.add(kp);
+ //鍥炴
+ HomeZbjtVo hk = paymentSlipMapper.homeZbjt();
+ homeZbjtVoList.add(hk);
+ //鍚堝悓绛捐 sgb smj jxc tfgs ymj
+ HomeZbjtVo htqd = contractMapper.homeZbjt();
+ homeZbjtVoList.add(htqd);
//璧婇攢浜х敓鍊� 浠婂ぉ鍙戣揣鍔犱粖澶╁紑绁ㄩ
// if (ObjUtil.isNotNull(ch)&&ObjUtil.isNotNull(kp)){
// HomeZbjtVo sxsy = ch.add(kp);
// homeZbjtVoList.add(sxsy);
// }else if (ObjUtil.isNotNull(ch)&&ObjUtil.isNull(kp)){
- homeZbjtVoList.add(ch);
+// homeZbjtVoList.add(ch);
// }else if (ObjUtil.isNull(ch)&&ObjUtil.isNotNull(kp)){
// homeZbjtVoList.add(kp);
// }else {
// homeZbjtVoList.add(new HomeZbjtVo());
// }
//璧婇攢绱鍓╀綑鍊� 浠婃棩鍙戣揣涓旀病寮�绁ㄧ殑鍑鸿揣
- HomeZbjtVo sx = contractOutBoundMapper.homeZbjtSX();
- homeZbjtVoList.add(sx);
- HomeZbjtVo yq = currentOverdueMapper.homeZbjt();
- //閫炬湡绱鍓╀綑 浠婃棩浜х敓閫炬湡 鍚巻鍙�
- HomeZbjtVo ls = historyOverdueMapper.homeZbjt();
- if (ObjUtil.isNotNull(ls)&&ObjUtil.isNotNull(yq)){
- homeZbjtVoList.add(yq.add(ls));
- }else if (ObjUtil.isNotNull(ls)&&ObjUtil.isNull(yq)){
- homeZbjtVoList.add(ls);
- }else if (ObjUtil.isNull(ls)&&ObjUtil.isNotNull(yq)){
- homeZbjtVoList.add(yq);
- }else {
- homeZbjtVoList.add(new HomeZbjtVo());
- }
- //閫炬湡浜х敓鍊� 浠婂ぉ浜х敓-浠婂ぉ宸蹭粯
-
- homeZbjtVoList.add(yq);
+// HomeZbjtVo sx = contractOutBoundMapper.homeZbjtSX();
+// homeZbjtVoList.add(sx);
+// HomeZbjtVo yq = currentOverdueMapper.homeZbjt();
+// //閫炬湡绱鍓╀綑 浠婃棩浜х敓閫炬湡 鍚巻鍙�
+// HomeZbjtVo ls = historyOverdueMapper.homeZbjt();
+// if (ObjUtil.isNotNull(ls)&&ObjUtil.isNotNull(yq)){
+// homeZbjtVoList.add(yq.add(ls));
+// }else if (ObjUtil.isNotNull(ls)&&ObjUtil.isNull(yq)){
+// homeZbjtVoList.add(ls);
+// }else if (ObjUtil.isNull(ls)&&ObjUtil.isNotNull(yq)){
+// homeZbjtVoList.add(yq);
+// }else {
+// homeZbjtVoList.add(new HomeZbjtVo());
+// }
+// //閫炬湡浜х敓鍊� 浠婂ぉ浜х敓-浠婂ぉ宸蹭粯
+//
+// homeZbjtVoList.add(yq);
return R.ok(homeZbjtVoList);
}
@Override
public R homeZgs() {
List<HomeZgsVo> homeZbjtVoList = new ArrayList<>();
- //鍚堝悓绛捐 鍗庡寳 瑗垮寳 涓滃寳 娴峰
- HomeZgsVo htqd = contractMapper.homeZgs(SecurityUtils.getUser().getCompId());
- homeZbjtVoList.add(htqd);
- //鍥炴
- HomeZgsVo hk = paymentSlipMapper.homeZgs(SecurityUtils.getUser().getCompId());
- homeZbjtVoList.add(hk);
- //鍑鸿揣
- HomeZgsVo ch = contractOutBoundMapper.homeZgs(SecurityUtils.getUser().getCompId());
- homeZbjtVoList.add(ch);
+
+// //鍑鸿揣
+// HomeZgsVo ch = contractOutBoundMapper.homeZgs(SecurityUtils.getUser().getCompId());
+// homeZbjtVoList.add(ch);
//寮�绁�
HomeZgsVo kp = contractInvoiceMapper.homeZgs(SecurityUtils.getUser().getCompId());
homeZbjtVoList.add(kp);
+ //鍥炴
+ HomeZgsVo hk = paymentSlipMapper.homeZgs(SecurityUtils.getUser().getCompId());
+ homeZbjtVoList.add(hk);
+ //鍚堝悓绛捐 鍗庡寳 瑗垮寳 涓滃寳 娴峰
+ HomeZgsVo htqd = contractMapper.homeZgs(SecurityUtils.getUser().getCompId());
+ homeZbjtVoList.add(htqd);
+
//璧婇攢浜х敓鍊�
// if (ObjUtil.isNotNull(ch)&&ObjUtil.isNotNull(kp)){
// HomeZgsVo sxsy = ch.add(kp);
// homeZbjtVoList.add(sxsy);
// }else if (ObjUtil.isNotNull(ch)&&ObjUtil.isNull(kp)){
- homeZbjtVoList.add(ch);
+// homeZbjtVoList.add(ch);
// }else if (ObjUtil.isNull(ch)&&ObjUtil.isNotNull(kp)){
// homeZbjtVoList.add(kp);
// }else {
// homeZbjtVoList.add(new HomeZgsVo());
// }
//璧婇攢绱鍓╀綑鍊�
- HomeZgsVo sx = contractOutBoundMapper.homeZgsSX(SecurityUtils.getUser().getCompId());
- homeZbjtVoList.add(sx);
-
- HomeZgsVo yq = currentOverdueMapper.homeZgs(SecurityUtils.getUser().getCompId());
-
- //閫炬湡浜х敓鍊�
- HomeZgsVo ls = historyOverdueMapper.homeZgs(SecurityUtils.getUser().getCompId());
- if (ObjUtil.isNotNull(ls)&&ObjUtil.isNotNull(yq)){
- homeZbjtVoList.add(yq.add(ls));
- }else if (ObjUtil.isNotNull(ls)&&ObjUtil.isNull(yq)){
- homeZbjtVoList.add(ls);
- }else if (ObjUtil.isNull(ls)&&ObjUtil.isNotNull(yq)){
- homeZbjtVoList.add(yq);
- }else {
- homeZbjtVoList.add(new HomeZgsVo());
- }
- //閫炬湡绱鍓╀綑
- homeZbjtVoList.add(yq);
+// HomeZgsVo sx = contractOutBoundMapper.homeZgsSX(SecurityUtils.getUser().getCompId());
+// homeZbjtVoList.add(sx);
+//
+// HomeZgsVo yq = currentOverdueMapper.homeZgs(SecurityUtils.getUser().getCompId());
+//
+// //閫炬湡浜х敓鍊�
+// HomeZgsVo ls = historyOverdueMapper.homeZgs(SecurityUtils.getUser().getCompId());
+// if (ObjUtil.isNotNull(ls)&&ObjUtil.isNotNull(yq)){
+// homeZbjtVoList.add(yq.add(ls));
+// }else if (ObjUtil.isNotNull(ls)&&ObjUtil.isNull(yq)){
+// homeZbjtVoList.add(ls);
+// }else if (ObjUtil.isNull(ls)&&ObjUtil.isNotNull(yq)){
+// homeZbjtVoList.add(yq);
+// }else {
+// homeZbjtVoList.add(new HomeZgsVo());
+// }
+// //閫炬湡绱鍓╀綑
+// homeZbjtVoList.add(yq);
return R.ok(homeZbjtVoList);
}
--
Gitblit v1.9.1