From d208d83d981008b389ab92ed9223b86d2e6ba127 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期二, 21 十月 2025 17:44:55 +0800
Subject: [PATCH] 修改bug
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/DataStatisticsController.java | 437 ++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 406 insertions(+), 31 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/DataStatisticsController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/DataStatisticsController.java
index 2161841..817978b 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/DataStatisticsController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/DataStatisticsController.java
@@ -8,10 +8,7 @@
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.framework.web.service.TokenService;
import com.ruoyi.system.model.*;
-import com.ruoyi.system.query.BranchAdminStatisticsOneQuery;
-import com.ruoyi.system.query.BranchAdminStatisticsThreeQuery;
-import com.ruoyi.system.query.BranchAdminStatisticsTwoQuery;
-import com.ruoyi.system.query.DataStatisticsQuery;
+import com.ruoyi.system.query.*;
import com.ruoyi.system.service.*;
import com.ruoyi.system.vo.*;
import io.swagger.annotations.Api;
@@ -20,10 +17,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.CollectionUtils;
import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import java.math.BigDecimal;
import java.text.SimpleDateFormat;
@@ -49,10 +43,11 @@
private final TSysOrderService sysOrderService;
private final TCrmBranchService crmBranchService;
private final TErpProcurementCommissionService erpProcurementCommissionService;
+ private final TCrmChangePointsService crmChangePointsService;
private final TCrmSalespersonService crmSalespersonService;
@Autowired
- public DataStatisticsController(TErpProcurementService erpProcurementService, TokenService tokenService, ISysUserService sysUserService, TCrmSupplierService crmSupplierService, TCrmClinicService crmClinicService, TSysAppUserService sysAppUserService, TCrmClinicPointsService crmClinicPointsService, TSysOrderService sysOrderService, TCrmBranchService crmBranchService, TErpProcurementCommissionService erpProcurementCommissionService, TCrmSalespersonService crmSalespersonService) {
+ public DataStatisticsController(TErpProcurementService erpProcurementService, TokenService tokenService, ISysUserService sysUserService, TCrmSupplierService crmSupplierService, TCrmClinicService crmClinicService, TSysAppUserService sysAppUserService, TCrmClinicPointsService crmClinicPointsService, TSysOrderService sysOrderService, TCrmBranchService crmBranchService, TErpProcurementCommissionService erpProcurementCommissionService, TCrmChangePointsService crmChangePointsService, TCrmSalespersonService crmSalespersonService) {
this.erpProcurementService = erpProcurementService;
this.tokenService = tokenService;
this.sysUserService = sysUserService;
@@ -63,6 +58,7 @@
this.sysOrderService = sysOrderService;
this.crmBranchService = crmBranchService;
this.erpProcurementCommissionService = erpProcurementCommissionService;
+ this.crmChangePointsService = crmChangePointsService;
this.crmSalespersonService = crmSalespersonService;
}
@@ -119,9 +115,9 @@
map.put("orderMoney", 0); // 订单金额
map.put("commissionMoney", 0); // 分佣金额
} else {
- BigDecimal orderMoney = orderQuantity.stream().map(TErpProcurement::getPayMoney).filter(Objects::nonNull).reduce(BigDecimal::add).get();
+ BigDecimal orderMoney = orderQuantity.stream().map(TErpProcurement::getPayMoney).reduce(BigDecimal.ZERO,BigDecimal::add);
map.put("orderMoney", orderMoney);
- BigDecimal commissionMoney = orderQuantity.stream().map(TErpProcurement::getSupplierMoney).filter(Objects::nonNull).reduce(BigDecimal::add).get();
+ BigDecimal commissionMoney = orderQuantity.stream().map(TErpProcurement::getSupplierMoney).reduce(BigDecimal.ZERO,BigDecimal::add);
map.put("commissionMoney", commissionMoney);
}
return R.ok(map);
@@ -130,7 +126,7 @@
/**
* 供应商采购统计
*/
- @ApiOperation(value = "供应商最近额30天采购统计", notes = "supplierThirtyProcurementStatistics:订单，supplierThirtyMoneyProcurementStatistics：金额")
+ @ApiOperation(value = "诊所/供应商最近30天采购统计", notes = "supplierThirtyProcurementStatistics:订单，supplierThirtyMoneyProcurementStatistics：金额")
@PostMapping(value = "/supplierThirtyProcurementStatistics")
public R<Map<String, Object>> supplierThirtyProcurementStatistics() {
Long userId = tokenService.getLoginUser().getUserId();
@@ -160,7 +156,7 @@
SimpleDateFormat format = new SimpleDateFormat("MM.dd");
for (int i = 0; i < 30; i++) {
LocalDateTime timeNow = localDateTime.plusDays(i);
- List<SupplierThirtyProcurementStatisticsVO> vos = supplierThirtyProcurementStatistics.stream().filter(vo -> timeNow.toLocalDate().isEqual(vo.getPayTime())).collect(Collectors.toList());
+ List<SupplierThirtyProcurementStatisticsVO> vos = supplierThirtyProcurementStatistics.stream().filter(vo -> Objects.nonNull(vo.getPayTime()) && timeNow.toLocalDate().isEqual(vo.getPayTime())).collect(Collectors.toList());
if (CollectionUtils.isEmpty(vos)) {
SupplierThirtyProcurementStatisticsVO vo = new SupplierThirtyProcurementStatisticsVO();
String time = format.format(DateUtils.localDateTimeToDate(timeNow));
@@ -168,7 +164,7 @@
vo.setOrderCount(0);
supplierThirtyProcurementStatistics.add(vo);
}
- List<SupplierThirtyMoneyProcurementStatisticsVO> moneyVOS = supplierThirtyMoneyProcurementStatistics.stream().filter(vo -> timeNow.toLocalDate().isEqual(vo.getPayTime())).collect(Collectors.toList());
+ List<SupplierThirtyMoneyProcurementStatisticsVO> moneyVOS = supplierThirtyMoneyProcurementStatistics.stream().filter(vo -> Objects.nonNull(vo.getPayTime()) && timeNow.toLocalDate().isEqual(vo.getPayTime())).collect(Collectors.toList());
if (CollectionUtils.isEmpty(moneyVOS)) {
SupplierThirtyMoneyProcurementStatisticsVO vo = new SupplierThirtyMoneyProcurementStatisticsVO();
String time = format.format(DateUtils.localDateTimeToDate(timeNow));
@@ -293,6 +289,16 @@
// 查询销售前十占比
List<SupplierSalesStatisticsGoodsTypeVO> supplierSalesStatisticsGoodsTypeVOS = erpProcurementService.supplierSalesStatisticsGoodsType(crmSupplier.getId(), startTime, endTime);
+ // 判断集合是否大于9
+ if (supplierSalesStatisticsGoodsTypeVOS.size() > 9) {
+ // 其余的添加到其他
+ List<SupplierSalesStatisticsGoodsTypeVO> otherList = supplierSalesStatisticsGoodsTypeVOS.subList(9, supplierSalesStatisticsGoodsTypeVOS.size());
+ SupplierSalesStatisticsGoodsTypeVO other = new SupplierSalesStatisticsGoodsTypeVO();
+ other.setTypeName("其他");
+ other.setGoodsCount(otherList.stream().mapToInt(SupplierSalesStatisticsGoodsTypeVO::getGoodsCount).sum());
+ supplierSalesStatisticsGoodsTypeVOS.add(other);
+ supplierSalesStatisticsGoodsTypeVOS = supplierSalesStatisticsGoodsTypeVOS.subList(0, 9);
+ }
supplierSalesStatisticsVO.setSupplierSalesStatisticsGoodsTypeVOS(supplierSalesStatisticsGoodsTypeVOS);
// 查询30天销售统计
List<SupplierSalesStatisticsGoodsCountVO> supplierSalesStatisticsGoodsCountVOS;
@@ -434,14 +440,24 @@
clinicSalesStatisticsVO.setSalesMoney(totalMoney);
// 查询销售前十占比
- List<ClinicSalesStatisticsGoodsTypeVO> clinicSalesStatisticsGoodsTypeVOS = sysOrderService.supplierSalesStatisticsGoodsType(crmClinic.getId(), startTime, endTime);
+ List<ClinicSalesStatisticsGoodsTypeVO> clinicSalesStatisticsGoodsTypeVOS = sysOrderService.clinicSalesStatisticsGoodsType(crmClinic.getId(), startTime, endTime);
+ // 判断集合是否大于9
+ if (clinicSalesStatisticsGoodsTypeVOS.size() > 9) {
+ // 其余的添加到其他
+ List<ClinicSalesStatisticsGoodsTypeVO> otherList = clinicSalesStatisticsGoodsTypeVOS.subList(9, clinicSalesStatisticsGoodsTypeVOS.size());
+ ClinicSalesStatisticsGoodsTypeVO other = new ClinicSalesStatisticsGoodsTypeVO();
+ other.setTypeName("其他");
+ other.setGoodsCount(otherList.stream().mapToInt(ClinicSalesStatisticsGoodsTypeVO::getGoodsCount).sum());
+ clinicSalesStatisticsGoodsTypeVOS.add(other);
+ clinicSalesStatisticsGoodsTypeVOS = clinicSalesStatisticsGoodsTypeVOS.subList(0, 9);
+ }
clinicSalesStatisticsVO.setClinicSalesStatisticsGoodsTypeVOS(clinicSalesStatisticsGoodsTypeVOS);
// 查询30天销售统计
List<ClinicSalesStatisticsGoodsCountVO> clinicSalesStatisticsGoodsCountVOS;
if (query.getTimeType() == 1 || query.getTimeType() == 2 || query.getTimeType() == 3) {
- clinicSalesStatisticsGoodsCountVOS = sysOrderService.supplierSalesStatisticsGoodsCount(crmClinic.getId(), startTime, endTime, query.getGoodsName());
+ clinicSalesStatisticsGoodsCountVOS = sysOrderService.clinicSalesStatisticsGoodsCount(crmClinic.getId(), startTime, endTime, query.getGoodsName());
} else {
- clinicSalesStatisticsGoodsCountVOS = sysOrderService.supplierSalesStatisticsGoodsCountMonth(crmClinic.getId(), startTime, endTime, query.getGoodsName());
+ clinicSalesStatisticsGoodsCountVOS = sysOrderService.clinicSalesStatisticsGoodsCountMonth(crmClinic.getId(), startTime, endTime, query.getGoodsName());
}
SimpleDateFormat format = new SimpleDateFormat("MM.dd");
SimpleDateFormat formatMonth = new SimpleDateFormat("yyyy.MM");
@@ -518,6 +534,12 @@
public static void main(String[] args) {
System.out.println(LocalDate.now().minusMonths(6));
+ List<Integer> list = new ArrayList<>();
+ for (int i = 0; i < 6; i++) {
+ list.add(i);
+ }
+ System.out.println(list.subList(2, list.size()));
+ System.out.println(list.subList(0, 2));
}
@@ -806,39 +828,36 @@
vo.setThirtyMoneyProcurementStatisticsVOS(thirtyMoneyProcurementStatisticsVOS);
-
-
-
ArrayList<ProcurementStatisticsVO> procurementStatisticsVOS = new ArrayList<>();
// 是否做了搜索
- if(query.getName()!=null && !query.getName().isEmpty()){
- collect = collect.stream().filter(e->e.getGoodsName().equals(query.getName())).collect(Collectors.toList());
+ if (query.getName() != null && !query.getName().isEmpty()) {
+ collect = collect.stream().filter(e -> e.getGoodsName().equals(query.getName())).collect(Collectors.toList());
}
- if(query.getType()==1){
+ if (query.getType() == 1) {
ProcurementStatisticsVO procurementStatisticsVO = new ProcurementStatisticsVO();
procurementStatisticsVO.setTime(LocalDate.now().toString());
procurementStatisticsVO.setCount(collect.stream().mapToInt(TErpProcurementGoods::getPurchaseCount).sum());
procurementStatisticsVOS.add(procurementStatisticsVO);
}
- if(query.getType()==2){
+ if (query.getType() == 2) {
// 昨日的数据
ProcurementStatisticsVO procurementStatisticsVO = new ProcurementStatisticsVO();
procurementStatisticsVO.setTime(LocalDate.now().minusDays(1).toString());
- procurementStatisticsVO.setCount(collect.stream().filter(e->e.getPayTime().toLocalDate().isEqual(LocalDate.now().minusDays(1))).mapToInt(TErpProcurementGoods::getPurchaseCount).sum());
+ procurementStatisticsVO.setCount(collect.stream().filter(e -> e.getPayTime().toLocalDate().isEqual(LocalDate.now().minusDays(1))).mapToInt(TErpProcurementGoods::getPurchaseCount).sum());
procurementStatisticsVOS.add(procurementStatisticsVO);
}
- if(query.getType()==3){
+ if (query.getType() == 3) {
// 近7天的数据
for (int i = 6; i >= 0; i--) {
ProcurementStatisticsVO procurementStatisticsVO = new ProcurementStatisticsVO();
procurementStatisticsVO.setTime(LocalDate.now().minusDays(i).toString());
int finalI = i;
- procurementStatisticsVO.setCount(collect.stream().filter(e->e.getPayTime().toLocalDate().isEqual(LocalDate.now().minusDays(finalI))).mapToInt(TErpProcurementGoods::getPurchaseCount).sum());
+ procurementStatisticsVO.setCount(collect.stream().filter(e -> e.getPayTime().toLocalDate().isEqual(LocalDate.now().minusDays(finalI))).mapToInt(TErpProcurementGoods::getPurchaseCount).sum());
procurementStatisticsVOS.add(procurementStatisticsVO);
}
}
- if(query.getType()==4){
+ if (query.getType() == 4) {
// 按月算
for (int i = 5; i >= 0; i--) {
ProcurementStatisticsVO procurementStatisticsVO = new ProcurementStatisticsVO();
@@ -847,12 +866,12 @@
String time = formatMonth.format(date);
procurementStatisticsVO.setTime(time);
// 按月算 年和月都要匹配
- procurementStatisticsVO.setCount(collect.stream().filter(e->time.equals(formatMonth.format(DateUtils.localDateTimeToDate(e.getPayTime())))).mapToInt(TErpProcurementGoods::getPurchaseCount).sum());
+ procurementStatisticsVO.setCount(collect.stream().filter(e -> time.equals(formatMonth.format(DateUtils.localDateTimeToDate(e.getPayTime())))).mapToInt(TErpProcurementGoods::getPurchaseCount).sum());
procurementStatisticsVOS.add(procurementStatisticsVO);
}
}
- if(query.getType()==5){
+ if (query.getType() == 5) {
// 按月算
for (int i = 11; i >= 0; i--) {
ProcurementStatisticsVO procurementStatisticsVO = new ProcurementStatisticsVO();
@@ -861,7 +880,7 @@
String time = formatMonth.format(date);
procurementStatisticsVO.setTime(time);
// 按月算 年和月都要匹配
- procurementStatisticsVO.setCount(collect.stream().filter(e->time.equals(formatMonth.format(DateUtils.localDateTimeToDate(e.getPayTime())))).mapToInt(TErpProcurementGoods::getPurchaseCount).sum());
+ procurementStatisticsVO.setCount(collect.stream().filter(e -> time.equals(formatMonth.format(DateUtils.localDateTimeToDate(e.getPayTime())))).mapToInt(TErpProcurementGoods::getPurchaseCount).sum());
procurementStatisticsVOS.add(procurementStatisticsVO);
}
}
@@ -872,4 +891,360 @@
return R.ok(vo);
}
+
+
+ /**
+ * 平台管理员-首页统计(第一部分)
+ */
+ @ApiOperation(value = "平台管理员-首页统计(第一部分)")
+ @PostMapping(value = "/platformAdminStatisticsOne")
+ public R<PlatformAdminStatisticsOneVo> platformAdminStatisticsOne(@RequestBody @Validated BranchAdminStatisticsOneQuery query) {
+ PlatformAdminStatisticsOneVo branchAdminStatisticsOneVo = new PlatformAdminStatisticsOneVo();
+ // 找出分公司下的所有员工 -》 所有诊所-》订单（状态 3=待发货 4=已发货 5=已入库）
+ SysUser user = tokenService.getLoginUser().getUser();
+
+ Integer roleType = user.getRoleType();
+ if (roleType == 1) {
+ List<TCrmClinic> list = crmClinicService.list();
+ if (!list.isEmpty()) {
+
+ long branchCount = crmBranchService.count();
+
+ long staffCount = crmSalespersonService.count();
+
+ List<TErpProcurement> procurementList = erpProcurementService.list(new LambdaQueryWrapper<TErpProcurement>().ne(TErpProcurement::getStatus, 6).isNotNull(TErpProcurement::getPayTime));
+ if (procurementList.isEmpty()) {
+ return R.ok(branchAdminStatisticsOneVo);
+ }
+ BigDecimal bigDecimal = procurementList.stream().map(TErpProcurement::getPayMoney).filter(Objects::nonNull).reduce(BigDecimal::add).get();
+ branchAdminStatisticsOneVo.setAllMoney(bigDecimal);
+ branchAdminStatisticsOneVo.setBranchCount((int) branchCount);
+ branchAdminStatisticsOneVo.setStaffCount((int) staffCount);
+
+ List<TErpProcurement> collect = null;
+ switch (query.getType()) {
+ case 1:
+ // procurementList算出今日的
+ collect = procurementList.stream().filter(procurement -> procurement.getPayTime().toLocalDate().isEqual(LocalDate.now())).collect(Collectors.toList());
+ break;
+ case 2:
+
+ // procurementList算出昨天的
+ collect = procurementList.stream().filter(procurement -> procurement.getPayTime().toLocalDate().isEqual(LocalDate.now().minusDays(1))).collect(Collectors.toList());
+ break;
+ case 3:
+ // 最近7天的
+ collect = procurementList.stream().filter(procurement -> procurement.getPayTime().toLocalDate().isAfter(LocalDate.now().minusDays(7))).collect(Collectors.toList());
+ break;
+ case 4:
+ // 最近半年
+ collect = procurementList.stream().filter(procurement -> procurement.getPayTime().toLocalDate().isAfter(LocalDate.now().minusMonths(6))).collect(Collectors.toList());
+ break;
+ case 5:
+ // 最近一年
+ collect = procurementList;
+ break;
+ }
+ branchAdminStatisticsOneVo.setOrderCount(collect.size());
+ branchAdminStatisticsOneVo.setMoneyProcurement(collect.stream().map(TErpProcurement::getPayMoney).reduce(BigDecimal.ZERO, BigDecimal::add));
+ branchAdminStatisticsOneVo.setPlatformMoney(collect.stream().map(TErpProcurement::getMoney).filter(Objects::nonNull).reduce(BigDecimal::add).orElse(BigDecimal.ZERO));
+ branchAdminStatisticsOneVo.setSupplierMoney(collect.stream().map(TErpProcurement::getSupplierMoney).filter(Objects::nonNull).reduce(BigDecimal::add).orElse(BigDecimal.ZERO));
+
+
+ List<TErpProcurementCommission> list1 = erpProcurementCommissionService.list();
+ List<TErpProcurementCommission> collect3 = null;
+ switch (query.getStaffType()) {
+ case 1:
+ // procurementList算出今日的
+ collect3 = list1.stream().filter(commission -> commission.getCreateTime().toLocalDate().isEqual(LocalDate.now())).collect(Collectors.toList());
+ break;
+ case 2:
+ // procurementList算出昨天的
+ collect3 = list1.stream().filter(commission -> commission.getCreateTime().toLocalDate().isEqual(LocalDate.now().minusDays(1))).collect(Collectors.toList());
+ break;
+ case 3:
+ // 最近7天的
+ collect3 = list1.stream().filter(commission -> commission.getCreateTime().toLocalDate().isAfter(LocalDate.now().minusDays(7))).collect(Collectors.toList());
+ break;
+ case 4:
+ // 最近半年
+ collect3 = list1.stream().filter(commission -> commission.getCreateTime().toLocalDate().isAfter(LocalDate.now().minusMonths(6))).collect(Collectors.toList());
+ break;
+ case 5:
+ // 最近一年
+ collect3 = list1;
+ break;
+ }
+
+ branchAdminStatisticsOneVo.setBranchMoney(collect3.stream().filter(e -> e.getCommissionType() == 1).map(TErpProcurementCommission::getMoney).reduce(BigDecimal::add).get());
+ branchAdminStatisticsOneVo.setStaffMoney(collect3.stream().filter(e -> e.getCommissionType() == 2).map(TErpProcurementCommission::getMoney).reduce(BigDecimal::add).get());
+ }
+
+
+ }
+ return R.ok(branchAdminStatisticsOneVo);
+
+ }
+
+ /**
+ * 平台管理员-首页统计(第二部分)
+ */
+ @ApiOperation(value = "平台管理员-首页统计(第二部分)")
+ @PostMapping(value = "/platformAdminStatisticsTwo")
+ public R<PlatformAdminStatisticsTwoVo> platformAdminStatisticsTwo(@RequestBody @Validated PlatformAdminStatisticsTwoQuery query) {
+ PlatformAdminStatisticsTwoVo branchAdminStatisticsOneVo = new PlatformAdminStatisticsTwoVo();
+ // 找出分公司下的所有员工 -》 所有诊所-》订单（状态 3=待发货 4=已发货 5=已入库）
+ SysUser user = tokenService.getLoginUser().getUser();
+
+ Integer roleType = user.getRoleType();
+ if (roleType == 1) {
+ LambdaQueryWrapper<TCrmClinic> w = new LambdaQueryWrapper<>();
+ if (query.getBranchId() != null && !query.getBranchId().isEmpty()) {
+ w.eq(TCrmClinic::getBranchId, query.getBranchId());
+ }
+ if (query.getSalespersonId() != null && !query.getSalespersonId().isEmpty()) {
+ w.eq(TCrmClinic::getSalespersonId, query.getSalespersonId());
+ }
+ List<TCrmClinic> list = crmClinicService.list(w);
+ branchAdminStatisticsOneVo.setClinicNum(list.size());
+
+ if (!list.isEmpty()) {
+ List<String> clinicIds = list.stream().map(TCrmClinic::getId).collect(Collectors.toList());
+ // 获取最近30的时间
+ LocalDateTime time = LocalDateTime.now().minusDays(30);
+ List<TErpProcurement> procurementList = erpProcurementService.list(new LambdaQueryWrapper<TErpProcurement>().between(TErpProcurement::getCreateTime, DateUtils.localDateTimeToDate(time), DateUtils.localDateTimeToDate(LocalDateTime.now())).ne(TErpProcurement::getStatus, 6).isNotNull(TErpProcurement::getPayTime).in(TErpProcurement::getClinicId, clinicIds));
+ if (procurementList.isEmpty()) {
+ return R.ok(branchAdminStatisticsOneVo);
+ }
+
+
+ String startTime = null;
+ String endTime = null;
+ switch (query.getType()) {
+ case 1:
+ // 获取今天的开始和结束时间
+ startTime = LocalDate.now() + " 00:00:00";
+ endTime = LocalDate.now() + " 23:59:59";
+ // 通过CreateTime查询今天的数据
+ break;
+ case 2:
+ // 获取昨天的开始和结束时间
+ startTime = LocalDate.now().minusDays(1) + " 00:00:00";
+ endTime = LocalDate.now().minusDays(1) + " 23:59:59";
+ break;
+ case 3:
+ // 最近7天的开始和结束时间
+ startTime = LocalDate.now().minusDays(6) + " 00:00:00";
+ endTime = LocalDate.now() + " 23:59:59";
+ break;
+ case 4:
+ // 最近半年
+ startTime = LocalDate.now().minusMonths(6) + " 00:00:00";
+ endTime = LocalDate.now() + " 23:59:59";
+
+ break;
+ case 5:
+ // 最近一年
+ startTime = LocalDate.now().minusYears(1) + " 00:00:00";
+ endTime = LocalDate.now() + " 23:59:59";
+ break;
+ }
+ List<TErpProcurementCommission> collect3 = erpProcurementCommissionService.list(new LambdaQueryWrapper<TErpProcurementCommission>()
+ .between(TErpProcurementCommission::getCreateTime, startTime, endTime));
+ List<TCrmChangePoints> pointsList = crmChangePointsService.list(new LambdaQueryWrapper<TCrmChangePoints>().eq(TCrmChangePoints::getChangeType,1)
+ .between(TCrmChangePoints::getCreateTime, startTime, endTime));
+ if(query.getBranchId()!=null && !query.getBranchId().isEmpty()){
+ BigDecimal bigDecimal = collect3.stream().filter(e -> e.getCommissionType() == 1 && e.getBranchSalespersonId().equals(query.getBranchId())).map(TErpProcurementCommission::getMoney).reduce(BigDecimal.ZERO,BigDecimal::add);
+ branchAdminStatisticsOneVo.setBranchMoney(bigDecimal);
+
+ int sum = pointsList.stream().filter(e -> e.getBranchSalespersonId().equals(query.getBranchId()) && e.getUserType() == 1).mapToInt(TCrmChangePoints::getChangeValue).sum();
+ branchAdminStatisticsOneVo.setBranchPoints(sum);
+
+ }else {
+ branchAdminStatisticsOneVo.setBranchMoney(collect3.stream().filter(e -> e.getCommissionType() == 1).map(TErpProcurementCommission::getMoney).reduce(BigDecimal.ZERO,BigDecimal::add));
+ int sum = pointsList.stream().filter(e -> e.getUserType() == 1).mapToInt(TCrmChangePoints::getChangeValue).sum();
+ branchAdminStatisticsOneVo.setBranchPoints(sum);
+ }
+ if(query.getSalespersonId()!=null && !query.getSalespersonId().isEmpty()){
+ BigDecimal bigDecimal = collect3.stream().filter(e -> e.getCommissionType() == 2 && e.getBranchSalespersonId().equals(query.getSalespersonId())).map(TErpProcurementCommission::getMoney).reduce(BigDecimal.ZERO,BigDecimal::add);
+ branchAdminStatisticsOneVo.setStaffMoney(bigDecimal);
+
+ int sum = pointsList.stream().filter(e -> e.getBranchSalespersonId().equals(query.getSalespersonId()) && e.getUserType() == 2).mapToInt(TCrmChangePoints::getChangeValue).sum();
+ branchAdminStatisticsOneVo.setStaffPoints(sum);
+ }else {
+ branchAdminStatisticsOneVo.setStaffMoney(collect3.stream().filter(e -> e.getCommissionType() == 2).map(TErpProcurementCommission::getMoney).reduce(BigDecimal.ZERO,BigDecimal::add));
+ int sum = pointsList.stream().filter(e -> e.getUserType() == 2).mapToInt(TCrmChangePoints::getChangeValue).sum();
+ branchAdminStatisticsOneVo.setStaffPoints(sum);
+ }
+
+
+ ArrayList<SupplierThirtyProcurementStatisticsVO> orderProcurementStatisticsVOS = new ArrayList<>();
+ ArrayList<SupplierThirtyMoneyProcurementStatisticsVO> moneyProcurementStatisticsVOS = new ArrayList<>();
+ for (int i = 29; i >= 0; i--) {
+ String string = LocalDate.now().minusDays(i).toString();
+ SupplierThirtyMoneyProcurementStatisticsVO thirtyMoneyProcurementStatisticsVO = new SupplierThirtyMoneyProcurementStatisticsVO();
+ thirtyMoneyProcurementStatisticsVO.setTime(string);
+ thirtyMoneyProcurementStatisticsVO.setMoneyTotal(procurementList.stream().filter(procurement -> procurement.getPayTime().toLocalDate().isEqual(LocalDate.parse(string))).map(TErpProcurement::getPayMoney).reduce(BigDecimal.ZERO, BigDecimal::add));
+ moneyProcurementStatisticsVOS.add(thirtyMoneyProcurementStatisticsVO);
+
+ SupplierThirtyProcurementStatisticsVO thirtyProcurementStatisticsVO = new SupplierThirtyProcurementStatisticsVO();
+ thirtyProcurementStatisticsVO.setTime(string);
+ thirtyProcurementStatisticsVO.setOrderCount((int) procurementList.stream().filter(procurement -> procurement.getPayTime().toLocalDate().isEqual(LocalDate.parse(string))).count());
+ orderProcurementStatisticsVOS.add(thirtyProcurementStatisticsVO);
+
+ }
+ branchAdminStatisticsOneVo.setThirtyMoneyProcurementStatisticsVOS(moneyProcurementStatisticsVOS);
+ branchAdminStatisticsOneVo.setThirtyProcurementStatisticsVOS(orderProcurementStatisticsVOS);
+
+
+ }
+
+
+ }
+ return R.ok(branchAdminStatisticsOneVo);
+
+ }
+
+
+ @ApiOperation(value = "平台管理员-首页统计(第三部分)")
+ @PostMapping(value = "/platformAdminStatisticsThree")
+ public R<BranchAdminStatisticsThreeVo> platformAdminStatisticsThree(@RequestBody @Validated BranchAdminStatisticsThreeQuery query) {
+ BranchAdminStatisticsThreeVo vo = new BranchAdminStatisticsThreeVo();
+ SysUser user = tokenService.getLoginUser().getUser();
+ SimpleDateFormat formatMonth = new SimpleDateFormat("yyyy-MM");
+ Integer roleType = user.getRoleType();
+ if (roleType == 1) {
+ LambdaQueryWrapper<TCrmClinic> eq = Wrappers.lambdaQuery(TCrmClinic.class);
+ if(query.getBranchId()!=null && !query.getBranchId().isEmpty()){
+ eq.eq(TCrmClinic::getBranchId, query.getBranchId());
+ }
+ List<TCrmClinic> list = crmClinicService.list(eq);
+
+ List<String> clinicIds = list.stream().map(TCrmClinic::getId).collect(Collectors.toList());
+ if (clinicIds.isEmpty()) {
+ return R.ok(vo);
+ }
+ // 查询这个诊所的所有订单并算出商品种类数 和 商品数
+ List<TErpProcurementGoods> erpProcurementGoods = erpProcurementService.branchAdminStatisticsThree(clinicIds);
+
+ // 根据商品id算出商品种类数
+ vo.setGoodsTypeCount((int) erpProcurementGoods.stream().map(TErpProcurementGoods::getGoodsId).distinct().count());
+
+ // 算出商品数
+ vo.setGoodsCount(erpProcurementGoods.stream().mapToInt(TErpProcurementGoods::getPurchaseCount).sum());
+ List<TErpProcurementGoods> collect = null;
+ switch (query.getType()) {
+ case 1:
+ // 通过payTime是今日的数据
+ collect = erpProcurementGoods.stream().filter(procurement -> procurement.getPayTime().toLocalDate().isEqual(LocalDate.now())).collect(Collectors.toList());
+ break;
+ case 2:
+ // 通过payTime是昨日的数据
+ collect = erpProcurementGoods.stream().filter(procurement -> procurement.getPayTime().toLocalDate().isEqual(LocalDate.now().minusDays(1))).collect(Collectors.toList());
+ break;
+ case 3:
+ // 通过payTime是近7天的数据
+ collect = erpProcurementGoods.stream().filter(procurement -> procurement.getPayTime().toLocalDate().isAfter(LocalDate.now().minusDays(7))).collect(Collectors.toList());
+ break;
+ case 4:
+ // 通过payTime是近半年的数据
+ collect = erpProcurementGoods.stream().filter(procurement -> procurement.getPayTime().toLocalDate().isAfter(LocalDate.now().minusMonths(6))).collect(Collectors.toList());
+ break;
+ case 5:
+ // 通过payTime是近一年的数据
+ collect = erpProcurementGoods;
+ break;
+ }
+ vo.setMoneyProcurement(collect.stream().map(TErpProcurementGoods::getPayMoney).reduce(BigDecimal.ZERO, BigDecimal::add));
+
+ //collect 通过goodsId 分组并 根据purchaseCount 倒叙
+ Map<String, List<TErpProcurementGoods>> collect2 = collect.stream().collect(groupingBy(TErpProcurementGoods::getGoodsId));
+ List<ClinicSalesStatisticsGoodsTypeVO> thirtyMoneyProcurementStatisticsVOS = collect2.entrySet().stream().map(entry -> {
+ ClinicSalesStatisticsGoodsTypeVO clinicSalesStatisticsGoodsTypeVO = new ClinicSalesStatisticsGoodsTypeVO();
+ clinicSalesStatisticsGoodsTypeVO.setGoodsCount(entry.getValue().stream().mapToInt(TErpProcurementGoods::getPurchaseCount).sum());
+ clinicSalesStatisticsGoodsTypeVO.setTypeName(entry.getValue().get(0).getGoodsName());
+ return clinicSalesStatisticsGoodsTypeVO;
+ }).sorted(Comparator.comparing(ClinicSalesStatisticsGoodsTypeVO::getGoodsCount).reversed()).limit(9).collect(Collectors.toList());
+ // 总数
+ int sum = collect.stream().mapToInt(TErpProcurementGoods::getPurchaseCount).sum();
+ int sum1 = thirtyMoneyProcurementStatisticsVOS.stream().mapToInt(ClinicSalesStatisticsGoodsTypeVO::getGoodsCount).sum();
+ if (sum - sum1 > 0) {
+ ClinicSalesStatisticsGoodsTypeVO clinicSalesStatisticsGoodsTypeVO = new ClinicSalesStatisticsGoodsTypeVO();
+ clinicSalesStatisticsGoodsTypeVO.setGoodsCount(sum - sum1);
+ clinicSalesStatisticsGoodsTypeVO.setTypeName("其他");
+ thirtyMoneyProcurementStatisticsVOS.add(clinicSalesStatisticsGoodsTypeVO);
+ }
+ vo.setThirtyMoneyProcurementStatisticsVOS(thirtyMoneyProcurementStatisticsVOS);
+
+
+ ArrayList<ProcurementStatisticsVO> procurementStatisticsVOS = new ArrayList<>();
+ // 是否做了搜索
+ if (query.getName() != null && !query.getName().isEmpty()) {
+ collect = collect.stream().filter(e -> e.getGoodsName().equals(query.getName())).collect(Collectors.toList());
+ }
+ if (query.getType() == 1) {
+ ProcurementStatisticsVO procurementStatisticsVO = new ProcurementStatisticsVO();
+ procurementStatisticsVO.setTime(LocalDate.now().toString());
+ procurementStatisticsVO.setCount(collect.stream().mapToInt(TErpProcurementGoods::getPurchaseCount).sum());
+ procurementStatisticsVOS.add(procurementStatisticsVO);
+ }
+ if (query.getType() == 2) {
+ // 昨日的数据
+ ProcurementStatisticsVO procurementStatisticsVO = new ProcurementStatisticsVO();
+ procurementStatisticsVO.setTime(LocalDate.now().minusDays(1).toString());
+ procurementStatisticsVO.setCount(collect.stream().filter(e -> e.getPayTime().toLocalDate().isEqual(LocalDate.now().minusDays(1))).mapToInt(TErpProcurementGoods::getPurchaseCount).sum());
+ procurementStatisticsVOS.add(procurementStatisticsVO);
+ }
+
+ if (query.getType() == 3) {
+ // 近7天的数据
+ for (int i = 6; i >= 0; i--) {
+ ProcurementStatisticsVO procurementStatisticsVO = new ProcurementStatisticsVO();
+ procurementStatisticsVO.setTime(LocalDate.now().minusDays(i).toString());
+ int finalI = i;
+ procurementStatisticsVO.setCount(collect.stream().filter(e -> e.getPayTime().toLocalDate().isEqual(LocalDate.now().minusDays(finalI))).mapToInt(TErpProcurementGoods::getPurchaseCount).sum());
+ procurementStatisticsVOS.add(procurementStatisticsVO);
+ }
+ }
+ if (query.getType() == 4) {
+ // 按月算
+ for (int i = 5; i >= 0; i--) {
+ ProcurementStatisticsVO procurementStatisticsVO = new ProcurementStatisticsVO();
+ LocalDateTime localDate = LocalDateTime.now().minusMonths(i);
+ Date date = DateUtils.localDateTimeToDate(localDate);
+ String time = formatMonth.format(date);
+ procurementStatisticsVO.setTime(time);
+ // 按月算 年和月都要匹配
+ procurementStatisticsVO.setCount(collect.stream().filter(e -> time.equals(formatMonth.format(DateUtils.localDateTimeToDate(e.getPayTime())))).mapToInt(TErpProcurementGoods::getPurchaseCount).sum());
+ procurementStatisticsVOS.add(procurementStatisticsVO);
+ }
+ }
+
+ if (query.getType() == 5) {
+ // 按月算
+ for (int i = 11; i >= 0; i--) {
+ ProcurementStatisticsVO procurementStatisticsVO = new ProcurementStatisticsVO();
+ LocalDateTime localDate = LocalDateTime.now().minusMonths(i);
+ Date date = DateUtils.localDateTimeToDate(localDate);
+ String time = formatMonth.format(date);
+ procurementStatisticsVO.setTime(time);
+ // 按月算 年和月都要匹配
+ procurementStatisticsVO.setCount(collect.stream().filter(e -> time.equals(formatMonth.format(DateUtils.localDateTimeToDate(e.getPayTime())))).mapToInt(TErpProcurementGoods::getPurchaseCount).sum());
+ procurementStatisticsVOS.add(procurementStatisticsVO);
+ }
+ }
+ vo.setThirtyProcurementStatisticsVOS(procurementStatisticsVOS);
+ }
+
+ return R.ok(vo);
+
+ }
+
+
+ @ApiOperation(value = "通过分公司id查询业务员列表")
+ @GetMapping(value = "/getSalespersonListByBranchId")
+ public R<List<TCrmSalesperson>> getSalespersonListByBranchId(@RequestParam String branchId) {
+ List<TCrmSalesperson> list = crmSalespersonService.list(new LambdaQueryWrapper<TCrmSalesperson>().eq(TCrmSalesperson::getBranchId, branchId));
+ return R.ok(list);
+ }
}
--
Gitblit v1.7.1