From 782cef1a49bb665fd88f3850a9193c08d63ef1d5 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期一, 13 十月 2025 17:58:01 +0800
Subject: [PATCH] 诊所和供应商首页统计
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/DataStatisticsController.java | 146 +++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 131 insertions(+), 15 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 a71a89c..9fa441a 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
@@ -2,13 +2,13 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.framework.web.service.TokenService;
-import com.ruoyi.system.model.TCrmSupplier;
-import com.ruoyi.system.model.TErpProcurement;
+import com.ruoyi.system.model.*;
import com.ruoyi.system.query.DataStatisticsQuery;
-import com.ruoyi.system.service.ISysUserService;
-import com.ruoyi.system.service.TCrmSupplierService;
-import com.ruoyi.system.service.TErpProcurementService;
+import com.ruoyi.system.service.*;
+import com.ruoyi.system.vo.SupplierThirtyMoneyProcurementStatisticsVO;
+import com.ruoyi.system.vo.SupplierThirtyProcurementStatisticsVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
@@ -19,10 +19,12 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
+import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
import java.time.LocalDate;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.time.LocalDateTime;
+import java.util.*;
+import java.util.stream.Collectors;
@Api(tags = "数据统计")
@RestController
@@ -33,19 +35,25 @@
private final TokenService tokenService;
private final ISysUserService sysUserService;
private final TCrmSupplierService crmSupplierService;
+ private final TCrmClinicService crmClinicService;
+ private final TSysAppUserService sysAppUserService;
+ private final TCrmClinicPointsService crmClinicPointsService;
@Autowired
- public DataStatisticsController(TErpProcurementService erpProcurementService, TokenService tokenService, ISysUserService sysUserService, TCrmSupplierService crmSupplierService) {
+ public DataStatisticsController(TErpProcurementService erpProcurementService, TokenService tokenService, ISysUserService sysUserService, TCrmSupplierService crmSupplierService, TCrmClinicService crmClinicService, TSysAppUserService sysAppUserService, TCrmClinicPointsService crmClinicPointsService) {
this.erpProcurementService = erpProcurementService;
this.tokenService = tokenService;
this.sysUserService = sysUserService;
this.crmSupplierService = crmSupplierService;
+ this.crmClinicService = crmClinicService;
+ this.sysAppUserService = sysAppUserService;
+ this.crmClinicPointsService = crmClinicPointsService;
}
/**
* 供应商采购统计
*/
- @ApiOperation(value = "供应商采购统计")
+ @ApiOperation(value = "供应商采购统计", notes = "orderTotal:总数;orderQuantity:订单数;orderMoney:订单金额;commissionMoney:分佣金额")
@PostMapping(value = "/supplierProcurementStatistics")
public R<Map<String, Object>> supplierProcurementStatistics(@Validated @RequestBody DataStatisticsQuery query) {
@@ -95,13 +103,121 @@
map.put("orderMoney", 0); // 订单金额
map.put("commissionMoney", 0); // 分佣金额
}else {
-// orderQuantity.stream().
-// map.put("commissionMoney", );
-// map.put("orderMoney", );
+ BigDecimal orderMoney = orderQuantity.stream().map(TErpProcurement::getPayMoney).filter(Objects::nonNull).reduce(BigDecimal::add).get();
+ map.put("orderMoney", orderMoney);
+ BigDecimal commissionMoney = orderQuantity.stream().map(TErpProcurement::getSupplierMoney).filter(Objects::nonNull).reduce(BigDecimal::add).get();
+ map.put("commissionMoney", commissionMoney);
}
-
- return R.ok();
+ return R.ok(map);
}
+ /**
+ * 供应商采购统计
+ */
+ @ApiOperation(value = "供应商最近额30天采购统计",notes = "supplierThirtyProcurementStatistics:订单,supplierThirtyMoneyProcurementStatistics:金额")
+ @PostMapping(value = "/supplierThirtyProcurementStatistics")
+ public R<Map<String,Object>> supplierThirtyProcurementStatistics() {
+ Long userId = tokenService.getLoginUser().getUserId();
+ Integer roleType = tokenService.getLoginUser().getUser().getRoleType();
+
+ String startTime = LocalDate.now().minusDays(29) + " 00:00:00";
+ String endTime = LocalDate.now() + " 23:59:59";
+
+ String supplierAndClinicId = null;
+ if(roleType == 4){
+ TCrmSupplier crmSupplier = crmSupplierService.getOne(Wrappers.lambdaQuery(TCrmSupplier.class)
+ .eq(TCrmSupplier::getUserId, userId));
+ supplierAndClinicId = crmSupplier.getId();
+ }else {
+ TCrmClinic crmClinic = crmClinicService.getOne(Wrappers.lambdaQuery(TCrmClinic.class)
+ .eq(TCrmClinic::getUserId, userId));
+ supplierAndClinicId = crmClinic.getId();
+ }
+
+ // 订单数
+ List<SupplierThirtyProcurementStatisticsVO> supplierThirtyProcurementStatistics = erpProcurementService.supplierThirtyProcurementStatistics(supplierAndClinicId, startTime, endTime,roleType);
+
+ // 金额
+ List<SupplierThirtyMoneyProcurementStatisticsVO> supplierThirtyMoneyProcurementStatistics = erpProcurementService.supplierThirtyMoneyProcurementStatistics(supplierAndClinicId, startTime, endTime,roleType);
+
+ LocalDateTime localDateTime = LocalDateTime.now().minusDays(29);
+ 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());
+ if(CollectionUtils.isEmpty(vos)){
+ SupplierThirtyProcurementStatisticsVO vo = new SupplierThirtyProcurementStatisticsVO();
+ String time = format.format(DateUtils.localDateTimeToDate(timeNow));
+ vo.setTime(time);
+ vo.setOrderCount(0);
+ supplierThirtyProcurementStatistics.add(vo);
+ }
+ List<SupplierThirtyMoneyProcurementStatisticsVO> moneyVOS = supplierThirtyMoneyProcurementStatistics.stream().filter(vo -> timeNow.toLocalDate().isEqual(vo.getPayTime())).collect(Collectors.toList());
+ if(CollectionUtils.isEmpty(moneyVOS)){
+ SupplierThirtyMoneyProcurementStatisticsVO vo = new SupplierThirtyMoneyProcurementStatisticsVO();
+ String time = format.format(DateUtils.localDateTimeToDate(timeNow));
+ vo.setTime(time);
+ vo.setMoneyTotal(BigDecimal.ZERO);
+ supplierThirtyMoneyProcurementStatistics.add(vo);
+ }
+ }
+ // 根据时间排序
+ supplierThirtyProcurementStatistics.sort(Comparator.comparing(SupplierThirtyProcurementStatisticsVO::getTime));
+ supplierThirtyMoneyProcurementStatistics.sort(Comparator.comparing(SupplierThirtyMoneyProcurementStatisticsVO::getTime));
+ Map<String,Object> map = new HashMap<>();
+ map.put("supplierThirtyProcurementStatistics", supplierThirtyProcurementStatistics);
+ map.put("supplierThirtyMoneyProcurementStatistics", supplierThirtyMoneyProcurementStatistics);
+ return R.ok(map);
+ }
+
+ /**
+ * 诊所患者统计
+ */
+ @ApiOperation(value = "诊所患者统计", notes = "userCount:患者总数;diseaseCount:慢性病患者数")
+ @PostMapping(value = "/clinicPatientStatistics")
+ public R<Map<String, Integer>> clinicPatientStatistics() {
+
+ Long userId = tokenService.getLoginUser().getUserId();
+
+ TCrmClinic crmClinic = crmClinicService.getOne(Wrappers.lambdaQuery(TCrmClinic.class)
+ .eq(TCrmClinic::getUserId, userId));
+
+ List<TSysAppUser> sysAppUsers = sysAppUserService.list(Wrappers.lambdaQuery(TSysAppUser.class)
+ .eq(TSysAppUser::getClinicId, crmClinic.getId()));
+ Map<String, Integer> map = new HashMap<>();
+ map.put("userCount", sysAppUsers.size());
+ map.put("diseaseCount", sysAppUsers.stream().filter(sysAppUser -> sysAppUser.getChronicDiseaseId() != null).collect(Collectors.toList()).size());
+ return R.ok(map);
+ }
+
+ /**
+ * 诊所积分统计
+ */
+ @ApiOperation(value = "诊所积分统计", notes = "remainingPoints:剩余积分;usedPoints:已用积分")
+ @PostMapping(value = "/clinicPointsStatistics")
+ public R<Map<String, Integer>> clinicPointsStatistics() {
+
+ Long userId = tokenService.getLoginUser().getUserId();
+
+ TCrmClinic crmClinic = crmClinicService.getOne(Wrappers.lambdaQuery(TCrmClinic.class)
+ .eq(TCrmClinic::getUserId, userId));
+
+ List<TCrmClinicPoints> crmClinicPoints = crmClinicPointsService.clinicPointsStatistics(crmClinic.getId(),LocalDate.now() + " 23:59:59");
+ Map<String, Integer> map = new HashMap<>();
+ if(CollectionUtils.isEmpty(crmClinicPoints)){
+ map.put("remainingPoints", 0);
+ map.put("usedPoints", 0);
+ }else {
+ int pointsTotal = crmClinicPoints.stream().mapToInt(TCrmClinicPoints::getPoints).sum();
+ int usePoints = crmClinicPoints.stream().mapToInt(TCrmClinicPoints::getUsePoints).sum();
+ map.put("remainingPoints", pointsTotal-usePoints);
+ map.put("usedPoints", usePoints);
+ }
+ return R.ok(map);
+ }
+
+ public static void main(String[] args) {
+ System.out.println(LocalDate.now().minusDays(30));
+ }
}
--
Gitblit v1.7.1