From 96118de3ac74f5468cf5d4ac73d6ea3bec1da010 Mon Sep 17 00:00:00 2001
From: shiyunteng <shiyunteng@example.com>
Date: 星期五, 20 十一月 2026 14:36:25 +0800
Subject: [PATCH] feat:新增销售指标 产品板块 重点工作 专项业务 产品收入和合同统计修改功能 feat:承兑新增承兑编号字段 feat:客商主数据更新名称 专项业务去年同月字段 机动车销售发票地址字段及判断 feat:银行流水更新客户id feat:机动车销售发票新增税务及代码字段 feat:流水更新按钮参数 feat:检索新增标的物运维按钮
---
platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/StatisticServiceImpl.java | 63 +++++++++++++++++++++++++++++--
1 files changed, 58 insertions(+), 5 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 1d3d727..d7e1813 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
@@ -58,6 +58,16 @@
@Value("${dept.smj}")
private String smj;
+ @Value("${dept.smjsc}")
+ private String smjsc;
+
+ @Value("${dept.smjzt}")
+ private String smjzt;
+
+ @Value("${dept.smjhw}")
+ private String smjhw;
+
+
@Value("${dept.sgb}")
private String sgb;
@@ -1347,10 +1357,14 @@
compIds.add(Long.valueOf(tfgs));
compIds.add(Long.valueOf(ymj));
compIds.add(Long.valueOf(jxc));
+ compIds.add(Long.valueOf(smjhw));
+ compIds.add(Long.valueOf(smjsc));
+ compIds.add(Long.valueOf(smjzt));
+ compIds.add(2056555602756063234L);
+
if (compIds.contains(userId)) {
return R.ok(false);
}
- ;
return R.ok(true);
}
@@ -1604,8 +1618,27 @@
if (CollUtil.isEmpty(items)) {
return R.failed("瀹㈠晢鐪佷唤瀛楀吀鍒嗙被鑾峰彇寮傚父");
}
+ Long compId = null;
+ List<Long> compIds = null;
+ if (StrUtil.equals(smj,SecurityUtils.getUser().getCompId()+"")||StrUtil.equals(smjhw,SecurityUtils.getUser().getCompId()+"")){
+ compIds = new ArrayList<>();
+ compIds.add(Long.valueOf(smj));
+ compIds.add(Long.valueOf(smjhw));
+ }
+ if (StrUtil.equals(smjsc,SecurityUtils.getUser().getCompId()+"")||StrUtil.equals(smjzt,SecurityUtils.getUser().getCompId()+"")
+ ||StrUtil.equals(sgb,SecurityUtils.getUser().getCompId()+"")||StrUtil.equals(jxc,SecurityUtils.getUser().getCompId()+"")
+ ||StrUtil.equals(tfgs,SecurityUtils.getUser().getCompId()+"")||StrUtil.equals(ymj,SecurityUtils.getUser().getCompId()+"")){
+ compId = SecurityUtils.getUser().getCompId();
+ }
+ if (StrUtil.equals("2056555602756063234",SecurityUtils.getUser().getCompId()+"")){
+ compIds = new ArrayList<>();
+ compIds.add(Long.valueOf(smj));
+ compIds.add(Long.valueOf(smjsc));
+ compIds.add(Long.valueOf(smjzt));
+ compIds.add(Long.valueOf(smjhw));
+ }
List<HomeZgsData> list = new ArrayList<>();
- List<String> contractProvinces = contractMapper.homeZgsColum(SecurityUtils.getUser().getCompId());
+ List<String> contractProvinces = contractMapper.homeZgsColum(compId,compIds);
if (CollUtil.isNotEmpty(contractProvinces)) {
contractProvinces.stream().forEach(province -> {
HomeZgsData homeZgsData = contractInvoiceMapper.homeZgsData(SecurityUtils.getUser().getCompId(), province);
@@ -1629,11 +1662,31 @@
@Override
public R zbjtStatistic() {
+
List<ZbjtStatisticVo> statisticVoList = new ArrayList<>();
String curYear = DateUtil.year(new Date()) + "";
String curMonth = DateUtil.month(new Date()) + "";
+ Long compId = null;
+ List<Long> compIds = null;
+ if (StrUtil.equals(smj,SecurityUtils.getUser().getCompId()+"")||StrUtil.equals(smjhw,SecurityUtils.getUser().getCompId()+"")){
+ compIds = new ArrayList<>();
+ compIds.add(Long.valueOf(smj));
+ compIds.add(Long.valueOf(smjhw));
+ }
+ if (StrUtil.equals(smjsc,SecurityUtils.getUser().getCompId()+"")||StrUtil.equals(smjzt,SecurityUtils.getUser().getCompId()+"")
+ ||StrUtil.equals(sgb,SecurityUtils.getUser().getCompId()+"")||StrUtil.equals(jxc,SecurityUtils.getUser().getCompId()+"")
+ ||StrUtil.equals(tfgs,SecurityUtils.getUser().getCompId()+"")||StrUtil.equals(ymj,SecurityUtils.getUser().getCompId()+"")){
+ compId = SecurityUtils.getUser().getCompId();
+ }
+ if (StrUtil.equals("2056555602756063234",SecurityUtils.getUser().getCompId()+"")){
+ compIds = new ArrayList<>();
+ compIds.add(Long.valueOf(smj));
+ compIds.add(Long.valueOf(smjsc));
+ compIds.add(Long.valueOf(smjzt));
+ compIds.add(Long.valueOf(smjhw));
+ }
//鍚堝悓
- ZbjtStatisticVo htVo = contractMapper.zbjtStatisticByContract();
+ ZbjtStatisticVo htVo = contractMapper.zbjtStatisticByContract(compId,compIds);
AnnualPlanTotalVo planListHt = annualPlanMapper.selectPlanYear(curYear, "1");
if (ObjUtil.isNotNull(htVo) && ObjUtil.isNotNull(planListHt)) {
BigDecimal monAmount = planListHt.getMonthAmount(curMonth);
@@ -1647,7 +1700,7 @@
}
statisticVoList.add(htVo);
//寮�绁�
- ZbjtStatisticVo kpVo = contractInvoiceMapper.zbjtStatisticByInvoice();
+ ZbjtStatisticVo kpVo = contractInvoiceMapper.zbjtStatisticByInvoice(compId,compIds);
AnnualPlanTotalVo planListFP = annualPlanMapper.selectPlanYear(curYear, "2");
if (ObjUtil.isNotNull(kpVo) && ObjUtil.isNotNull(planListFP)) {
BigDecimal monAmount = planListFP.getMonthAmount(curMonth);
@@ -1661,7 +1714,7 @@
}
statisticVoList.add(kpVo);
//鍥炴
- ZbjtStatisticVo hkVo = paymentSlipMapper.zbjtStatisticByPayment();
+ ZbjtStatisticVo hkVo = paymentSlipMapper.zbjtStatisticByPayment(compId,compIds);
AnnualPlanTotalVo planListHK = annualPlanMapper.selectPlanYear(curYear, "2");
if (ObjUtil.isNotNull(hkVo) && ObjUtil.isNotNull(planListHK)) {
BigDecimal monAmount = planListHK.getMonthAmount(curMonth);
--
Gitblit v1.9.1