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 | 133 +++++++++++++++++++++++---------------------
1 files changed, 69 insertions(+), 64 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 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