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/service/impl/StatisticServiceImpl.java | 245 +++++++++++++++++++++++++------------------------
1 files changed, 125 insertions(+), 120 deletions(-)
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 98f4ba0..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
@@ -1,6 +1,6 @@
package com.by4cloud.platformx.business.service.impl;
-import cn.hutool.core.util.ArrayUtil;
+import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.ObjUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -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));
@@ -92,7 +91,7 @@
compIds.add(Long.valueOf(ymj));
compIds.add(Long.valueOf(jxc));
List<ContractIncomeAnalysisVo> contractIncomeAnalysisVoList = contractMapper.contractIncomeAnalysis(commonDTO,compIds);
- if (ArrayUtil.isNotEmpty(contractIncomeAnalysisVoList.toArray())){
+ if (CollUtil.isNotEmpty(contractIncomeAnalysisVoList)){
contractIncomeAnalysisVoList.stream().forEach(contractIncomeAnalysisVo -> {
if(StrUtil.equals(contractIncomeAnalysisVo.getCompId(),sgb)){
contractIncomeAnalysisVo.setCompName("鐭冲伐娉�");
@@ -124,7 +123,7 @@
public R contractAmountAnalysisByArea(AnalysisCommonDTO commonDTO) {
R<List<SysDictItem>> r = remoteDictService.getDictByType("company_area");
List<SysDictItem> items = r.getData();
- if (ArrayUtil.isEmpty(items.toArray())){
+ if (CollUtil.isEmpty(items)){
return R.failed("鍦板尯瀛楀吀鍒嗙被鑾峰彇寮傚父");
}
List<Long> compIds = new ArrayList<>();
@@ -164,7 +163,7 @@
public R contractAmountAnalysisByIndustry(AnalysisCommonDTO commonDTO) {
R<List<SysDictItem>> r = remoteDictService.getDictByType("industry_sector");
List<SysDictItem> items = r.getData();
- if (ArrayUtil.isEmpty(items.toArray())){
+ if (CollUtil.isEmpty(items)){
return R.failed("琛屼笟瀛楀吀鍒嗙被鑾峰彇寮傚父");
}
List<Long> compIds = new ArrayList<>();
@@ -204,7 +203,7 @@
public R contractAmountAnalysisByMarket(AnalysisCommonDTO commonDTO) {
R<List<SysDictItem>> r = remoteDictService.getDictByType("market_type");
List<SysDictItem> items = r.getData();
- if (ArrayUtil.isEmpty(items.toArray())){
+ if (CollUtil.isEmpty(items)){
return R.failed("甯傚満绫诲瀷瀛楀吀鍒嗙被鑾峰彇寮傚父");
}
List<Long> compIds = new ArrayList<>();
@@ -244,7 +243,7 @@
public R contractAmountAnalysisBySpcBus(AnalysisCommonDTO commonDTO) {
R<List<SysDictItem>> r = remoteDictService.getDictByType("supply_attribute");
List<SysDictItem> items = r.getData();
- if (ArrayUtil.isEmpty(items.toArray())){
+ if (CollUtil.isEmpty(items)){
return R.failed("渚涘簲灞炴�у瓧鍏稿垎绫昏幏鍙栧紓甯�");
}
List<Long> compIds = new ArrayList<>();
@@ -284,7 +283,7 @@
public R contractAmountAnalysisByExportBus(AnalysisCommonDTO commonDTO) {
R<List<SysDictItem>> r = remoteDictService.getDictByType("export_attr");
List<SysDictItem> items = r.getData();
- if (ArrayUtil.isEmpty(items.toArray())){
+ if (CollUtil.isEmpty(items)){
return R.failed("鍖哄煙瀛楁鑾峰彇寮傚父");
}
List<Long> compIds = new ArrayList<>();
@@ -325,7 +324,7 @@
public R contractAmountAnalysisBySaleModel(AnalysisCommonDTO commonDTO) {
R<List<SysDictItem>> r = remoteDictService.getDictByType("sales_model");
List<SysDictItem> items = r.getData();
- if (ArrayUtil.isEmpty(items.toArray())){
+ if (CollUtil.isEmpty(items)){
return R.failed("閿�鍞ā寮忓瓧鍏稿垎绫昏幏鍙栧紓甯�");
}
List<Long> compIds = new ArrayList<>();
@@ -366,11 +365,11 @@
public R agingAnalysisByArea(AnalysisCommonDTO commonDTO) {
R<List<SysDictItem>> r = remoteDictService.getDictByType("company_area");
List<SysDictItem> items = r.getData();
- if (ArrayUtil.isEmpty(items.toArray())){
+ if (CollUtil.isEmpty(items)){
return R.failed("鍦板尯瀛楀吀鍒嗙被鑾峰彇寮傚父");
}
// List<AgingCompanyVo> companys = contractPaymentScheduleMapper.selectAgingCompany(DataScope.of("comp_id"));
-// if (ArrayUtil.isEmpty(companys.toArray())){
+// if (CollUtil.isEmpty(companys)){
// return R.failed("鏆傛棤璐﹂緞");
// }
List<Long> compIds = new ArrayList<>();
@@ -382,7 +381,7 @@
List<AgingAnalysisVo> result = new ArrayList<>();
AgingQueryDTO queryDTO = new AgingQueryDTO();
- if (ArrayUtil.contains(compIds.toArray(),SecurityUtils.getUser().getCompId())){
+ if (CollUtil.contains(compIds,SecurityUtils.getUser().getCompId())){
queryDTO.setCompanyId(SecurityUtils.getUser().getCompId());
}
List<AgingVo> agingVoList = contractPaymentScheduleMapper.selectAgingTotal(queryDTO);
@@ -392,7 +391,7 @@
queryDTO.setAreaId(item.getItemValue());
List<AgingVo> companyAgingVo = contractPaymentScheduleMapper.selectAgingTotal(queryDTO);
//琛ュ叏鏁版嵁
- if (ArrayUtil.isEmpty(companyAgingVo.toArray())){
+ if (CollUtil.isEmpty(companyAgingVo)){
companyAgingVo = new ArrayList<>();
AgingVo agingVo1 = new AgingVo(1L,"0-30澶�",new BigDecimal("0"),null);
AgingVo agingVo2 = new AgingVo(2L,"31-60澶�",new BigDecimal("0"),null);
@@ -408,27 +407,27 @@
companyAgingVo.add(agingVo6);
}else {
List<String> overdueRanges = companyAgingVo.stream().map(AgingVo::getOverdueRange).collect(Collectors.toList());
- if (!ArrayUtil.contains(overdueRanges.toArray(),"0-30澶�")){
+ if (!CollUtil.contains(overdueRanges,"0-30澶�")){
AgingVo agingVo1 = new AgingVo(1L,"0-30澶�",new BigDecimal("0"),null);
companyAgingVo.add(agingVo1);
}
- if (!ArrayUtil.contains(overdueRanges.toArray(),"31-60澶�")){
+ if (!CollUtil.contains(overdueRanges,"31-60澶�")){
AgingVo agingVo2 = new AgingVo(2L,"31-60澶�",new BigDecimal("0"),null);
companyAgingVo.add(agingVo2);
}
- if (!ArrayUtil.contains(overdueRanges.toArray(),"61-90澶�")){
+ if (!CollUtil.contains(overdueRanges,"61-90澶�")){
AgingVo agingVo3 = new AgingVo(3L,"61-90澶�",new BigDecimal("0"),null);
companyAgingVo.add(agingVo3);
}
- if (!ArrayUtil.contains(overdueRanges.toArray(),"91-180澶�")){
+ if (!CollUtil.contains(overdueRanges,"91-180澶�")){
AgingVo agingVo4 = new AgingVo(4L,"91-180澶�",new BigDecimal("0"),null);
companyAgingVo.add(agingVo4);
}
- if (!ArrayUtil.contains(overdueRanges.toArray(),"181-365澶�")){
+ if (!CollUtil.contains(overdueRanges,"181-365澶�")){
AgingVo agingVo5 = new AgingVo(5L,"181-365澶�",new BigDecimal("0"),null);
companyAgingVo.add(agingVo5);
}
- if (!ArrayUtil.contains(overdueRanges.toArray(),"1骞翠互涓�")){
+ if (!CollUtil.contains(overdueRanges,"1骞翠互涓�")){
AgingVo agingVo6 = new AgingVo(6L,"1骞翠互涓�",new BigDecimal("0"),null);
companyAgingVo.add(agingVo6);
}
@@ -473,19 +472,20 @@
public R agingAnalysisByIndustry(AnalysisCommonDTO commonDTO) {
R<List<SysDictItem>> r = remoteDictService.getDictByType("industry_sector");
List<SysDictItem> items = r.getData();
- if (ArrayUtil.isEmpty(items.toArray())){
+ if (CollUtil.isEmpty(items)){
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();
- if (ArrayUtil.contains(compIds.toArray(),SecurityUtils.getUser().getCompId())){
+ if (CollUtil.contains(compIds,SecurityUtils.getUser().getCompId())){
queryDTO.setCompanyId(SecurityUtils.getUser().getCompId());
}
List<AgingVo> agingVoList = contractPaymentScheduleMapper.selectAgingTotal(queryDTO);
@@ -495,7 +495,7 @@
queryDTO.setIndustryId(item.getItemValue());
List<AgingVo> companyAgingVo = contractPaymentScheduleMapper.selectAgingTotal(queryDTO);
//琛ュ叏鏁版嵁
- if (ArrayUtil.isEmpty(companyAgingVo.toArray())){
+ if (CollUtil.isEmpty(companyAgingVo)){
companyAgingVo = new ArrayList<>();
AgingVo agingVo1 = new AgingVo(1L,"0-30澶�",new BigDecimal("0"),null);
AgingVo agingVo2 = new AgingVo(2L,"31-60澶�",new BigDecimal("0"),null);
@@ -511,27 +511,27 @@
companyAgingVo.add(agingVo6);
}else {
List<String> overdueRanges = companyAgingVo.stream().map(AgingVo::getOverdueRange).collect(Collectors.toList());
- if (!ArrayUtil.contains(overdueRanges.toArray(),"0-30澶�")){
+ if (!CollUtil.contains(overdueRanges,"0-30澶�")){
AgingVo agingVo1 = new AgingVo(1L,"0-30澶�",new BigDecimal("0"),null);
companyAgingVo.add(agingVo1);
}
- if (!ArrayUtil.contains(overdueRanges.toArray(),"31-60澶�")){
+ if (!CollUtil.contains(overdueRanges,"31-60澶�")){
AgingVo agingVo2 = new AgingVo(2L,"31-60澶�",new BigDecimal("0"),null);
companyAgingVo.add(agingVo2);
}
- if (!ArrayUtil.contains(overdueRanges.toArray(),"61-90澶�")){
+ if (!CollUtil.contains(overdueRanges,"61-90澶�")){
AgingVo agingVo3 = new AgingVo(3L,"61-90澶�",new BigDecimal("0"),null);
companyAgingVo.add(agingVo3);
}
- if (!ArrayUtil.contains(overdueRanges.toArray(),"91-180澶�")){
+ if (!CollUtil.contains(overdueRanges,"91-180澶�")){
AgingVo agingVo4 = new AgingVo(4L,"91-180澶�",new BigDecimal("0"),null);
companyAgingVo.add(agingVo4);
}
- if (!ArrayUtil.contains(overdueRanges.toArray(),"181-365澶�")){
+ if (!CollUtil.contains(overdueRanges,"181-365澶�")){
AgingVo agingVo5 = new AgingVo(5L,"181-365澶�",new BigDecimal("0"),null);
companyAgingVo.add(agingVo5);
}
- if (!ArrayUtil.contains(overdueRanges.toArray(),"1骞翠互涓�")){
+ if (!CollUtil.contains(overdueRanges,"1骞翠互涓�")){
AgingVo agingVo6 = new AgingVo(6L,"1骞翠互涓�",new BigDecimal("0"),null);
companyAgingVo.add(agingVo6);
}
@@ -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,11 +591,11 @@
}
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);
//琛ュ叏鏁版嵁
- if (ArrayUtil.isEmpty(companyAgingVo.toArray())){
+ if (CollUtil.isEmpty(companyAgingVo)){
companyAgingVo = new ArrayList<>();
AgingVo agingVo1 = new AgingVo(1L,"0-30澶�",new BigDecimal("0"),null);
AgingVo agingVo2 = new AgingVo(2L,"31-60澶�",new BigDecimal("0"),null);
@@ -611,27 +611,27 @@
companyAgingVo.add(agingVo6);
}else {
List<String> overdueRanges = companyAgingVo.stream().map(AgingVo::getOverdueRange).collect(Collectors.toList());
- if (!ArrayUtil.contains(overdueRanges.toArray(),"0-30澶�")){
+ if (!CollUtil.contains(overdueRanges,"0-30澶�")){
AgingVo agingVo1 = new AgingVo(1L,"0-30澶�",new BigDecimal("0"),null);
companyAgingVo.add(agingVo1);
}
- if (!ArrayUtil.contains(overdueRanges.toArray(),"31-60澶�")){
+ if (!CollUtil.contains(overdueRanges,"31-60澶�")){
AgingVo agingVo2 = new AgingVo(2L,"31-60澶�",new BigDecimal("0"),null);
companyAgingVo.add(agingVo2);
}
- if (!ArrayUtil.contains(overdueRanges.toArray(),"61-90澶�")){
+ if (!CollUtil.contains(overdueRanges,"61-90澶�")){
AgingVo agingVo3 = new AgingVo(3L,"61-90澶�",new BigDecimal("0"),null);
companyAgingVo.add(agingVo3);
}
- if (!ArrayUtil.contains(overdueRanges.toArray(),"91-180澶�")){
+ if (!CollUtil.contains(overdueRanges,"91-180澶�")){
AgingVo agingVo4 = new AgingVo(4L,"91-180澶�",new BigDecimal("0"),null);
companyAgingVo.add(agingVo4);
}
- if (!ArrayUtil.contains(overdueRanges.toArray(),"181-365澶�")){
+ if (!CollUtil.contains(overdueRanges,"181-365澶�")){
AgingVo agingVo5 = new AgingVo(5L,"181-365澶�",new BigDecimal("0"),null);
companyAgingVo.add(agingVo5);
}
- if (!ArrayUtil.contains(overdueRanges.toArray(),"1骞翠互涓�")){
+ if (!CollUtil.contains(overdueRanges,"1骞翠互涓�")){
AgingVo agingVo6 = new AgingVo(6L,"1骞翠互涓�",new BigDecimal("0"),null);
companyAgingVo.add(agingVo6);
}
@@ -688,11 +688,11 @@
}
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);
//琛ュ叏鏁版嵁
- if (ArrayUtil.isEmpty(companyAgingVo.toArray())){
+ if (CollUtil.isEmpty(companyAgingVo)){
companyAgingVo = new ArrayList<>();
AgingVo agingVo1 = new AgingVo(1L,"0-30澶�",new BigDecimal("0"),null);
AgingVo agingVo2 = new AgingVo(2L,"31-60澶�",new BigDecimal("0"),null);
@@ -708,27 +708,27 @@
companyAgingVo.add(agingVo6);
}else {
List<String> overdueRanges = companyAgingVo.stream().map(AgingVo::getOverdueRange).collect(Collectors.toList());
- if (!ArrayUtil.contains(overdueRanges.toArray(),"0-30澶�")){
+ if (!CollUtil.contains(overdueRanges,"0-30澶�")){
AgingVo agingVo1 = new AgingVo(1L,"0-30澶�",new BigDecimal("0"),null);
companyAgingVo.add(agingVo1);
}
- if (!ArrayUtil.contains(overdueRanges.toArray(),"31-60澶�")){
+ if (!CollUtil.contains(overdueRanges,"31-60澶�")){
AgingVo agingVo2 = new AgingVo(2L,"31-60澶�",new BigDecimal("0"),null);
companyAgingVo.add(agingVo2);
}
- if (!ArrayUtil.contains(overdueRanges.toArray(),"61-90澶�")){
+ if (!CollUtil.contains(overdueRanges,"61-90澶�")){
AgingVo agingVo3 = new AgingVo(3L,"61-90澶�",new BigDecimal("0"),null);
companyAgingVo.add(agingVo3);
}
- if (!ArrayUtil.contains(overdueRanges.toArray(),"91-180澶�")){
+ if (!CollUtil.contains(overdueRanges,"91-180澶�")){
AgingVo agingVo4 = new AgingVo(4L,"91-180澶�",new BigDecimal("0"),null);
companyAgingVo.add(agingVo4);
}
- if (!ArrayUtil.contains(overdueRanges.toArray(),"181-365澶�")){
+ if (!CollUtil.contains(overdueRanges,"181-365澶�")){
AgingVo agingVo5 = new AgingVo(5L,"181-365澶�",new BigDecimal("0"),null);
companyAgingVo.add(agingVo5);
}
- if (!ArrayUtil.contains(overdueRanges.toArray(),"1骞翠互涓�")){
+ if (!CollUtil.contains(overdueRanges,"1骞翠互涓�")){
AgingVo agingVo6 = new AgingVo(6L,"1骞翠互涓�",new BigDecimal("0"),null);
companyAgingVo.add(agingVo6);
}
@@ -775,7 +775,7 @@
public R agingAnalysisByMarket(AnalysisCommonDTO commonDTO) {
R<List<SysDictItem>> r = remoteDictService.getDictByType("market_type");
List<SysDictItem> items = r.getData();
- if (ArrayUtil.isEmpty(items.toArray())){
+ if (CollUtil.isEmpty(items)){
return R.failed("甯傚満绫诲瀷瀛楀吀鍒嗙被鑾峰彇寮傚父");
}
List<AgingAnalysisVo> result = new ArrayList<>();
@@ -787,7 +787,7 @@
queryDTO.setClassId(item.getItemValue());
List<AgingVo> companyAgingVo = contractPaymentScheduleMapper.selectAgingTotal(queryDTO);
//琛ュ叏鏁版嵁
- if (ArrayUtil.isEmpty(companyAgingVo.toArray())){
+ if (CollUtil.isEmpty(companyAgingVo)){
companyAgingVo = new ArrayList<>();
AgingVo agingVo1 = new AgingVo(1L,"0-30澶�",new BigDecimal("0"),null);
AgingVo agingVo2 = new AgingVo(2L,"31-60澶�",new BigDecimal("0"),null);
@@ -803,27 +803,27 @@
companyAgingVo.add(agingVo6);
}else {
List<String> overdueRanges = companyAgingVo.stream().map(AgingVo::getOverdueRange).collect(Collectors.toList());
- if (!ArrayUtil.contains(overdueRanges.toArray(),"0-30澶�")){
+ if (!CollUtil.contains(overdueRanges,"0-30澶�")){
AgingVo agingVo1 = new AgingVo(1L,"0-30澶�",new BigDecimal("0"),null);
companyAgingVo.add(agingVo1);
}
- if (!ArrayUtil.contains(overdueRanges.toArray(),"31-60澶�")){
+ if (!CollUtil.contains(overdueRanges,"31-60澶�")){
AgingVo agingVo2 = new AgingVo(2L,"31-60澶�",new BigDecimal("0"),null);
companyAgingVo.add(agingVo2);
}
- if (!ArrayUtil.contains(overdueRanges.toArray(),"61-90澶�")){
+ if (!CollUtil.contains(overdueRanges,"61-90澶�")){
AgingVo agingVo3 = new AgingVo(3L,"61-90澶�",new BigDecimal("0"),null);
companyAgingVo.add(agingVo3);
}
- if (!ArrayUtil.contains(overdueRanges.toArray(),"91-180澶�")){
+ if (!CollUtil.contains(overdueRanges,"91-180澶�")){
AgingVo agingVo4 = new AgingVo(4L,"91-180澶�",new BigDecimal("0"),null);
companyAgingVo.add(agingVo4);
}
- if (!ArrayUtil.contains(overdueRanges.toArray(),"181-365澶�")){
+ if (!CollUtil.contains(overdueRanges,"181-365澶�")){
AgingVo agingVo5 = new AgingVo(5L,"181-365澶�",new BigDecimal("0"),null);
companyAgingVo.add(agingVo5);
}
- if (!ArrayUtil.contains(overdueRanges.toArray(),"1骞翠互涓�")){
+ if (!CollUtil.contains(overdueRanges,"1骞翠互涓�")){
AgingVo agingVo6 = new AgingVo(6L,"1骞翠互涓�",new BigDecimal("0"),null);
companyAgingVo.add(agingVo6);
}
@@ -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,11 +883,11 @@
}
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);
//琛ュ叏鏁版嵁
- if (ArrayUtil.isEmpty(companyAgingVo.toArray())){
+ if (CollUtil.isEmpty(companyAgingVo)){
companyAgingVo = new ArrayList<>();
AgingVo agingVo1 = new AgingVo(1L,"0-30澶�",new BigDecimal("0"),null);
AgingVo agingVo2 = new AgingVo(2L,"31-60澶�",new BigDecimal("0"),null);
@@ -902,27 +903,27 @@
companyAgingVo.add(agingVo6);
}else {
List<String> overdueRanges = companyAgingVo.stream().map(AgingVo::getOverdueRange).collect(Collectors.toList());
- if (!ArrayUtil.contains(overdueRanges.toArray(),"0-30澶�")){
+ if (!CollUtil.contains(overdueRanges,"0-30澶�")){
AgingVo agingVo1 = new AgingVo(1L,"0-30澶�",new BigDecimal("0"),null);
companyAgingVo.add(agingVo1);
}
- if (!ArrayUtil.contains(overdueRanges.toArray(),"31-60澶�")){
+ if (!CollUtil.contains(overdueRanges,"31-60澶�")){
AgingVo agingVo2 = new AgingVo(2L,"31-60澶�",new BigDecimal("0"),null);
companyAgingVo.add(agingVo2);
}
- if (!ArrayUtil.contains(overdueRanges.toArray(),"61-90澶�")){
+ if (!CollUtil.contains(overdueRanges,"61-90澶�")){
AgingVo agingVo3 = new AgingVo(3L,"61-90澶�",new BigDecimal("0"),null);
companyAgingVo.add(agingVo3);
}
- if (!ArrayUtil.contains(overdueRanges.toArray(),"91-180澶�")){
+ if (!CollUtil.contains(overdueRanges,"91-180澶�")){
AgingVo agingVo4 = new AgingVo(4L,"91-180澶�",new BigDecimal("0"),null);
companyAgingVo.add(agingVo4);
}
- if (!ArrayUtil.contains(overdueRanges.toArray(),"181-365澶�")){
+ if (!CollUtil.contains(overdueRanges,"181-365澶�")){
AgingVo agingVo5 = new AgingVo(5L,"181-365澶�",new BigDecimal("0"),null);
companyAgingVo.add(agingVo5);
}
- if (!ArrayUtil.contains(overdueRanges.toArray(),"1骞翠互涓�")){
+ if (!CollUtil.contains(overdueRanges,"1骞翠互涓�")){
AgingVo agingVo6 = new AgingVo(6L,"1骞翠互涓�",new BigDecimal("0"),null);
companyAgingVo.add(agingVo6);
}
@@ -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