From be9e92d2c30fdfeed4bdd3a5aea2c84bd93f61f4 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期三, 15 十月 2025 16:23:24 +0800
Subject: [PATCH] bug修改
---
ruoyi-system/src/main/java/com/ruoyi/system/vo/BranchAdminStatisticsOneVo.java | 37 ++
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TErpProcurementServiceImpl.java | 18 +
ruoyi-system/src/main/resources/mapper/system/TSysOrderMapper.xml | 4
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TErpProcurementController.java | 8
ruoyi-system/src/main/java/com/ruoyi/system/query/BranchAdminStatisticsOneQuery.java | 18 +
ruoyi-system/src/main/java/com/ruoyi/system/service/TErpProcurementService.java | 9
ruoyi-system/src/main/java/com/ruoyi/system/mapper/TSysOrderMapper.java | 4
ruoyi-system/src/main/java/com/ruoyi/system/vo/BranchAdminStatisticsThreeVo.java | 29 ++
ruoyi-system/src/main/resources/mapper/system/TErpClinicWarehousingMapper.xml | 2
ruoyi-system/src/main/java/com/ruoyi/system/mapper/TErpProcurementMapper.java | 3
ruoyi-system/src/main/java/com/ruoyi/system/service/TSysOrderService.java | 5
ruoyi-system/src/main/java/com/ruoyi/system/query/BranchAdminStatisticsTwoQuery.java | 18 +
ruoyi-system/src/main/java/com/ruoyi/system/vo/BranchAdminStatisticsTwoVo.java | 29 ++
ruoyi-system/src/main/resources/mapper/system/TErpProcurementMapper.xml | 18 +
ruoyi-system/src/main/java/com/ruoyi/system/model/TErpProcurementCommission.java | 3
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TSysOrderServiceImpl.java | 8
ruoyi-system/src/main/java/com/ruoyi/system/dto/UpdateStatusProcurementDto.java | 3
ruoyi-system/src/main/java/com/ruoyi/system/model/TErpProcurementGoods.java | 7
ruoyi-system/src/main/java/com/ruoyi/system/vo/ProcurementStatisticsVO.java | 23 +
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/DataStatisticsController.java | 465 ++++++++++++++++++++++++++++++++---
ruoyi-system/src/main/java/com/ruoyi/system/model/TErpProcurement.java | 5
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TErpClinicWarehousingServiceImpl.java | 6
ruoyi-system/src/main/java/com/ruoyi/system/query/BranchAdminStatisticsThreeQuery.java | 18 +
ruoyi-system/src/main/java/com/ruoyi/system/vo/DetailProcurementVO.java | 10
24 files changed, 682 insertions(+), 68 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 cdd01ec..2161841 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
@@ -1,15 +1,22 @@
package com.ruoyi.web.controller.api;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.core.domain.model.LoginUser;
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.service.*;
import com.ruoyi.system.vo.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import org.apache.poi.ss.formula.functions.T;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.CollectionUtils;
import org.springframework.validation.annotation.Validated;
@@ -25,6 +32,8 @@
import java.util.*;
import java.util.stream.Collectors;
+import static java.util.stream.Collectors.groupingBy;
+
@Api(tags = "数据统计")
@RestController
@RequestMapping("/data-statistics")
@@ -38,9 +47,12 @@
private final TSysAppUserService sysAppUserService;
private final TCrmClinicPointsService crmClinicPointsService;
private final TSysOrderService sysOrderService;
+ private final TCrmBranchService crmBranchService;
+ private final TErpProcurementCommissionService erpProcurementCommissionService;
+ private final TCrmSalespersonService crmSalespersonService;
@Autowired
- public DataStatisticsController(TErpProcurementService erpProcurementService, TokenService tokenService, ISysUserService sysUserService, TCrmSupplierService crmSupplierService, TCrmClinicService crmClinicService, TSysAppUserService sysAppUserService, TCrmClinicPointsService crmClinicPointsService, TSysOrderService sysOrderService) {
+ public DataStatisticsController(TErpProcurementService erpProcurementService, TokenService tokenService, ISysUserService sysUserService, TCrmSupplierService crmSupplierService, TCrmClinicService crmClinicService, TSysAppUserService sysAppUserService, TCrmClinicPointsService crmClinicPointsService, TSysOrderService sysOrderService, TCrmBranchService crmBranchService, TErpProcurementCommissionService erpProcurementCommissionService, TCrmSalespersonService crmSalespersonService) {
this.erpProcurementService = erpProcurementService;
this.tokenService = tokenService;
this.sysUserService = sysUserService;
@@ -49,6 +61,9 @@
this.sysAppUserService = sysAppUserService;
this.crmClinicPointsService = crmClinicPointsService;
this.sysOrderService = sysOrderService;
+ this.crmBranchService = crmBranchService;
+ this.erpProcurementCommissionService = erpProcurementCommissionService;
+ this.crmSalespersonService = crmSalespersonService;
}
/**
@@ -62,7 +77,7 @@
String startTime = null;
String endTime = null;
- switch (query.getTimeType()){
+ switch (query.getTimeType()) {
case 1:
startTime = LocalDate.now() + " 00:00:00";
endTime = LocalDate.now() + " 23:59:59";
@@ -92,18 +107,18 @@
List<TErpProcurement> orderTotal = erpProcurementService.list(Wrappers.lambdaQuery(TErpProcurement.class)
.eq(TErpProcurement::getSupplierId, crmSupplier.getId())
- .in(TErpProcurement::getStatus, 3,4,5));
+ .in(TErpProcurement::getStatus, 3, 4, 5));
map.put("orderTotal", orderTotal.size()); // 总数
List<TErpProcurement> orderQuantity = erpProcurementService.list(Wrappers.lambdaQuery(TErpProcurement.class)
.eq(TErpProcurement::getSupplierId, crmSupplier.getId())
.between(TErpProcurement::getPayTime, startTime, endTime)
- .in(TErpProcurement::getStatus, 3,4,5));
+ .in(TErpProcurement::getStatus, 3, 4, 5));
map.put("orderQuantity", orderQuantity.size()); // 订单数
- if(CollectionUtils.isEmpty(orderTotal)){
+ if (CollectionUtils.isEmpty(orderTotal)) {
map.put("orderMoney", 0); // 订单金额
map.put("commissionMoney", 0); // 分佣金额
- }else {
+ } else {
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();
@@ -115,9 +130,9 @@
/**
* 供应商采购统计
*/
- @ApiOperation(value = "供应商最近额30天采购统计",notes = "supplierThirtyProcurementStatistics:订单，supplierThirtyMoneyProcurementStatistics：金额")
+ @ApiOperation(value = "供应商最近额30天采购统计", notes = "supplierThirtyProcurementStatistics:订单，supplierThirtyMoneyProcurementStatistics：金额")
@PostMapping(value = "/supplierThirtyProcurementStatistics")
- public R<Map<String,Object>> supplierThirtyProcurementStatistics() {
+ public R<Map<String, Object>> supplierThirtyProcurementStatistics() {
Long userId = tokenService.getLoginUser().getUserId();
Integer roleType = tokenService.getLoginUser().getUser().getRoleType();
@@ -125,28 +140,28 @@
String endTime = LocalDate.now() + " 23:59:59";
String supplierAndClinicId = null;
- if(roleType == 4){
+ if (roleType == 4) {
TCrmSupplier crmSupplier = crmSupplierService.getOne(Wrappers.lambdaQuery(TCrmSupplier.class)
.eq(TCrmSupplier::getUserId, userId));
supplierAndClinicId = crmSupplier.getId();
- }else {
+ } 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<SupplierThirtyProcurementStatisticsVO> supplierThirtyProcurementStatistics = erpProcurementService.supplierThirtyProcurementStatistics(supplierAndClinicId, startTime, endTime, roleType);
// 金额
- List<SupplierThirtyMoneyProcurementStatisticsVO> supplierThirtyMoneyProcurementStatistics = erpProcurementService.supplierThirtyMoneyProcurementStatistics(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)){
+ if (CollectionUtils.isEmpty(vos)) {
SupplierThirtyProcurementStatisticsVO vo = new SupplierThirtyProcurementStatisticsVO();
String time = format.format(DateUtils.localDateTimeToDate(timeNow));
vo.setTime(time);
@@ -154,7 +169,7 @@
supplierThirtyProcurementStatistics.add(vo);
}
List<SupplierThirtyMoneyProcurementStatisticsVO> moneyVOS = supplierThirtyMoneyProcurementStatistics.stream().filter(vo -> timeNow.toLocalDate().isEqual(vo.getPayTime())).collect(Collectors.toList());
- if(CollectionUtils.isEmpty(moneyVOS)){
+ if (CollectionUtils.isEmpty(moneyVOS)) {
SupplierThirtyMoneyProcurementStatisticsVO vo = new SupplierThirtyMoneyProcurementStatisticsVO();
String time = format.format(DateUtils.localDateTimeToDate(timeNow));
vo.setTime(time);
@@ -165,7 +180,7 @@
// 根据时间排序
supplierThirtyProcurementStatistics.sort(Comparator.comparing(SupplierThirtyProcurementStatisticsVO::getTime));
supplierThirtyMoneyProcurementStatistics.sort(Comparator.comparing(SupplierThirtyMoneyProcurementStatisticsVO::getTime));
- Map<String,Object> map = new HashMap<>();
+ Map<String, Object> map = new HashMap<>();
map.put("supplierThirtyProcurementStatistics", supplierThirtyProcurementStatistics);
map.put("supplierThirtyMoneyProcurementStatistics", supplierThirtyMoneyProcurementStatistics);
return R.ok(map);
@@ -203,15 +218,15 @@
TCrmClinic crmClinic = crmClinicService.getOne(Wrappers.lambdaQuery(TCrmClinic.class)
.eq(TCrmClinic::getUserId, userId));
- List<TCrmClinicPoints> crmClinicPoints = crmClinicPointsService.clinicPointsStatistics(crmClinic.getId(),LocalDate.now() + " 23:59:59");
+ List<TCrmClinicPoints> crmClinicPoints = crmClinicPointsService.clinicPointsStatistics(crmClinic.getId(), LocalDate.now() + " 23:59:59");
Map<String, Integer> map = new HashMap<>();
- if(CollectionUtils.isEmpty(crmClinicPoints)){
+ if (CollectionUtils.isEmpty(crmClinicPoints)) {
map.put("remainingPoints", 0);
map.put("usedPoints", 0);
- }else {
+ } else {
int pointsTotal = crmClinicPoints.stream().mapToInt(TCrmClinicPoints::getPoints).sum();
int usePoints = crmClinicPoints.stream().mapToInt(TCrmClinicPoints::getUsePoints).sum();
- map.put("remainingPoints", pointsTotal-usePoints);
+ map.put("remainingPoints", pointsTotal - usePoints);
map.put("usedPoints", usePoints);
}
return R.ok(map);
@@ -220,9 +235,9 @@
/**
* 供应商销售统计总类总数
*/
- @ApiOperation(value = "供应商销售统计总类总数",notes = "typeTotalCount:总类，totalCount：总数")
+ @ApiOperation(value = "供应商销售统计总类总数", notes = "typeTotalCount:总类，totalCount：总数")
@PostMapping(value = "/supplierSalesStatisticsSum")
- public R<Map<String,Integer>> supplierSalesStatisticsSum() {
+ public R<Map<String, Integer>> supplierSalesStatisticsSum() {
Long userId = tokenService.getLoginUser().getUserId();
TCrmSupplier crmSupplier = crmSupplierService.getOne(Wrappers.lambdaQuery(TCrmSupplier.class)
@@ -230,7 +245,7 @@
// 查询药品总类和总数
Integer typeTotalCount = erpProcurementService.supplierSalesStatisticsTypeCount(crmSupplier.getId());
Integer totalCount = erpProcurementService.supplierSalesStatisticsCount(crmSupplier.getId());
- Map<String,Integer> map = new HashMap<>();
+ Map<String, Integer> map = new HashMap<>();
map.put("typeTotalCount", typeTotalCount);
map.put("totalCount", totalCount);
@@ -247,7 +262,7 @@
String startTime = null;
String endTime = null;
- switch (query.getTimeType()){
+ switch (query.getTimeType()) {
case 1:
startTime = LocalDate.now() + " 00:00:00";
endTime = LocalDate.now() + " 23:59:59";
@@ -281,16 +296,16 @@
supplierSalesStatisticsVO.setSupplierSalesStatisticsGoodsTypeVOS(supplierSalesStatisticsGoodsTypeVOS);
// 查询30天销售统计
List<SupplierSalesStatisticsGoodsCountVO> supplierSalesStatisticsGoodsCountVOS;
- if(query.getTimeType() == 1 || query.getTimeType() == 2 || query.getTimeType() == 3){
- supplierSalesStatisticsGoodsCountVOS = erpProcurementService.supplierSalesStatisticsGoodsCount(crmSupplier.getId(), startTime, endTime,query.getGoodsName());
- }else {
- supplierSalesStatisticsGoodsCountVOS = erpProcurementService.supplierSalesStatisticsGoodsCountMonth(crmSupplier.getId(), startTime, endTime,query.getGoodsName());
+ if (query.getTimeType() == 1 || query.getTimeType() == 2 || query.getTimeType() == 3) {
+ supplierSalesStatisticsGoodsCountVOS = erpProcurementService.supplierSalesStatisticsGoodsCount(crmSupplier.getId(), startTime, endTime, query.getGoodsName());
+ } else {
+ supplierSalesStatisticsGoodsCountVOS = erpProcurementService.supplierSalesStatisticsGoodsCountMonth(crmSupplier.getId(), startTime, endTime, query.getGoodsName());
}
SimpleDateFormat format = new SimpleDateFormat("MM.dd");
SimpleDateFormat formatMonth = new SimpleDateFormat("yyyy.MM");
- switch (query.getTimeType()){
+ switch (query.getTimeType()) {
case 1:
- if(CollectionUtils.isEmpty(supplierSalesStatisticsGoodsCountVOS)){
+ if (CollectionUtils.isEmpty(supplierSalesStatisticsGoodsCountVOS)) {
SupplierSalesStatisticsGoodsCountVO supplierSalesStatisticsGoodsCountVO = new SupplierSalesStatisticsGoodsCountVO();
String time = format.format(DateUtils.localDateTimeToDate(LocalDateTime.now()));
supplierSalesStatisticsGoodsCountVO.setTime(time);
@@ -299,7 +314,7 @@
}
break;
case 2:
- if(CollectionUtils.isEmpty(supplierSalesStatisticsGoodsCountVOS)){
+ if (CollectionUtils.isEmpty(supplierSalesStatisticsGoodsCountVOS)) {
SupplierSalesStatisticsGoodsCountVO supplierSalesStatisticsGoodsCountVO = new SupplierSalesStatisticsGoodsCountVO();
String time = format.format(DateUtils.localDateTimeToDate(LocalDateTime.now().minusDays(1)));
supplierSalesStatisticsGoodsCountVO.setTime(time);
@@ -312,7 +327,7 @@
for (int i = 0; i < 7; i++) {
LocalDateTime timeNow = days.plusDays(i);
List<SupplierSalesStatisticsGoodsCountVO> vos = supplierSalesStatisticsGoodsCountVOS.stream().filter(vo -> timeNow.toLocalDate().isEqual(vo.getPayTime())).collect(Collectors.toList());
- if(CollectionUtils.isEmpty(vos)){
+ if (CollectionUtils.isEmpty(vos)) {
SupplierSalesStatisticsGoodsCountVO vo = new SupplierSalesStatisticsGoodsCountVO();
String time = format.format(DateUtils.localDateTimeToDate(timeNow));
vo.setTime(time);
@@ -329,7 +344,7 @@
Date date = DateUtils.localDateTimeToDate(timeNow);
String time = formatMonth.format(date);
List<SupplierSalesStatisticsGoodsCountVO> vos = supplierSalesStatisticsGoodsCountVOS.stream().filter(vo -> time.equals(vo.getTime())).collect(Collectors.toList());
- if(CollectionUtils.isEmpty(vos)){
+ if (CollectionUtils.isEmpty(vos)) {
SupplierSalesStatisticsGoodsCountVO vo = new SupplierSalesStatisticsGoodsCountVO();
vo.setTime(time);
vo.setGoodsCount(0);
@@ -345,7 +360,7 @@
Date date = DateUtils.localDateTimeToDate(timeNow);
String time = formatMonth.format(date);
List<SupplierSalesStatisticsGoodsCountVO> vos = supplierSalesStatisticsGoodsCountVOS.stream().filter(vo -> time.equals(vo.getTime())).collect(Collectors.toList());
- if(CollectionUtils.isEmpty(vos)){
+ if (CollectionUtils.isEmpty(vos)) {
SupplierSalesStatisticsGoodsCountVO vo = new SupplierSalesStatisticsGoodsCountVO();
vo.setTime(time);
vo.setGoodsCount(0);
@@ -362,17 +377,17 @@
/**
* 诊所销售统计总类总数
*/
- @ApiOperation(value = "诊所销售统计总类总数",notes = "typeTotalCount:总类，totalCount：总数")
+ @ApiOperation(value = "诊所销售统计总类总数", notes = "typeTotalCount:总类，totalCount：总数")
@PostMapping(value = "/clinicSalesStatisticsSum")
- public R<Map<String,Integer>> clinicSalesStatisticsSum() {
+ public R<Map<String, Integer>> clinicSalesStatisticsSum() {
Long userId = tokenService.getLoginUser().getUserId();
TCrmClinic crmClinic = crmClinicService.getOne(Wrappers.lambdaQuery(TCrmClinic.class)
.eq(TCrmClinic::getUserId, userId));
// 查询药品总类和总数
- Integer typeTotalCount = sysOrderService.clinicSalesStatisticsTypeCount(crmClinic.getId());
- Integer totalCount = sysOrderService.clinicSalesStatisticsCount(crmClinic.getId());
- Map<String,Integer> map = new HashMap<>();
+ Integer typeTotalCount = sysOrderService.clinicSalesStatisticsTypeCount(Arrays.asList(crmClinic.getId()));
+ Integer totalCount = sysOrderService.clinicSalesStatisticsCount(Arrays.asList(crmClinic.getId()));
+ Map<String, Integer> map = new HashMap<>();
map.put("typeTotalCount", typeTotalCount);
map.put("totalCount", totalCount);
@@ -389,7 +404,7 @@
String startTime = null;
String endTime = null;
- switch (query.getTimeType()){
+ switch (query.getTimeType()) {
case 1:
startTime = LocalDate.now() + " 00:00:00";
endTime = LocalDate.now() + " 23:59:59";
@@ -423,16 +438,16 @@
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());
- }else {
- clinicSalesStatisticsGoodsCountVOS = sysOrderService.supplierSalesStatisticsGoodsCountMonth(crmClinic.getId(), startTime, endTime,query.getGoodsName());
+ if (query.getTimeType() == 1 || query.getTimeType() == 2 || query.getTimeType() == 3) {
+ clinicSalesStatisticsGoodsCountVOS = sysOrderService.supplierSalesStatisticsGoodsCount(crmClinic.getId(), startTime, endTime, query.getGoodsName());
+ } else {
+ clinicSalesStatisticsGoodsCountVOS = sysOrderService.supplierSalesStatisticsGoodsCountMonth(crmClinic.getId(), startTime, endTime, query.getGoodsName());
}
SimpleDateFormat format = new SimpleDateFormat("MM.dd");
SimpleDateFormat formatMonth = new SimpleDateFormat("yyyy.MM");
- switch (query.getTimeType()){
+ switch (query.getTimeType()) {
case 1:
- if(CollectionUtils.isEmpty(clinicSalesStatisticsGoodsCountVOS)){
+ if (CollectionUtils.isEmpty(clinicSalesStatisticsGoodsCountVOS)) {
ClinicSalesStatisticsGoodsCountVO clinicSalesStatisticsGoodsCountVO = new ClinicSalesStatisticsGoodsCountVO();
String time = format.format(DateUtils.localDateTimeToDate(LocalDateTime.now()));
clinicSalesStatisticsGoodsCountVO.setTime(time);
@@ -441,7 +456,7 @@
}
break;
case 2:
- if(CollectionUtils.isEmpty(clinicSalesStatisticsGoodsCountVOS)){
+ if (CollectionUtils.isEmpty(clinicSalesStatisticsGoodsCountVOS)) {
ClinicSalesStatisticsGoodsCountVO clinicSalesStatisticsGoodsCountVO = new ClinicSalesStatisticsGoodsCountVO();
String time = format.format(DateUtils.localDateTimeToDate(LocalDateTime.now().minusDays(1)));
clinicSalesStatisticsGoodsCountVO.setTime(time);
@@ -454,7 +469,7 @@
for (int i = 0; i < 7; i++) {
LocalDateTime timeNow = days.plusDays(i);
List<ClinicSalesStatisticsGoodsCountVO> vos = clinicSalesStatisticsGoodsCountVOS.stream().filter(vo -> timeNow.toLocalDate().isEqual(vo.getPayTime())).collect(Collectors.toList());
- if(CollectionUtils.isEmpty(vos)){
+ if (CollectionUtils.isEmpty(vos)) {
ClinicSalesStatisticsGoodsCountVO vo = new ClinicSalesStatisticsGoodsCountVO();
String time = format.format(DateUtils.localDateTimeToDate(timeNow));
vo.setTime(time);
@@ -471,7 +486,7 @@
Date date = DateUtils.localDateTimeToDate(timeNow);
String time = formatMonth.format(date);
List<ClinicSalesStatisticsGoodsCountVO> vos = clinicSalesStatisticsGoodsCountVOS.stream().filter(vo -> time.equals(vo.getTime())).collect(Collectors.toList());
- if(CollectionUtils.isEmpty(vos)){
+ if (CollectionUtils.isEmpty(vos)) {
ClinicSalesStatisticsGoodsCountVO vo = new ClinicSalesStatisticsGoodsCountVO();
vo.setTime(time);
vo.setGoodsCount(0);
@@ -487,7 +502,7 @@
Date date = DateUtils.localDateTimeToDate(timeNow);
String time = formatMonth.format(date);
List<ClinicSalesStatisticsGoodsCountVO> vos = clinicSalesStatisticsGoodsCountVOS.stream().filter(vo -> time.equals(vo.getTime())).collect(Collectors.toList());
- if(CollectionUtils.isEmpty(vos)){
+ if (CollectionUtils.isEmpty(vos)) {
ClinicSalesStatisticsGoodsCountVO vo = new ClinicSalesStatisticsGoodsCountVO();
vo.setTime(time);
vo.setGoodsCount(0);
@@ -505,4 +520,356 @@
System.out.println(LocalDate.now().minusMonths(6));
}
+
+ /**
+ * 分公司管理员-首页统计(第一部分)
+ */
+ @ApiOperation(value = "分公司管理员-首页统计(第一部分)")
+ @PostMapping(value = "/branchAdminStatisticsOne")
+ public R<BranchAdminStatisticsOneVo> branchAdminStatisticsOne(@RequestBody @Validated BranchAdminStatisticsOneQuery query) {
+ BranchAdminStatisticsOneVo branchAdminStatisticsOneVo = new BranchAdminStatisticsOneVo();
+ // 找出分公司下的所有员工 -》 所有诊所-》订单（状态 3=待发货 4=已发货 5=已入库）
+ SysUser user = tokenService.getLoginUser().getUser();
+
+ Integer roleType = user.getRoleType();
+ if (roleType == 2) {
+ TCrmBranch branch = crmBranchService.getOne(Wrappers.lambdaQuery(TCrmBranch.class)
+ .eq(TCrmBranch::getUserId, user.getUserId()));
+ if (branch != null) {
+ List<TCrmClinic> list = crmClinicService.list(Wrappers.lambdaQuery(TCrmClinic.class).eq(TCrmClinic::getBranchId, branch.getId()));
+ if (!list.isEmpty()) {
+ List<String> crmClinicIds = list.stream().map(TCrmClinic::getId).collect(Collectors.toList());
+
+ // 获取最近一年的时间
+ LocalDateTime time = LocalDateTime.now().minusYears(1);
+ 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, crmClinicIds));
+ List<TErpProcurementCommission> list1 = erpProcurementCommissionService.list(new LambdaQueryWrapper<TErpProcurementCommission>().eq(TErpProcurementCommission::getBranchSalespersonId, branch.getId()).eq(TErpProcurementCommission::getCommissionType, 1).between(TErpProcurementCommission::getCreateTime, DateUtils.localDateTimeToDate(time), DateUtils.localDateTimeToDate(LocalDateTime.now())));
+
+ // list1 获取本月的
+ List<TErpProcurementCommission> list2 = list1.stream().filter(commission -> commission.getCreateTime().toLocalDate().isAfter(time.toLocalDate())).collect(Collectors.toList());
+ branchAdminStatisticsOneVo.setMonthMoney(list2.stream().map(TErpProcurementCommission::getMoney).filter(Objects::nonNull).reduce(BigDecimal::add).orElse(BigDecimal.ZERO));
+
+
+ if (!procurementList.isEmpty()) {
+ List<TErpProcurement> collect = null;
+ List<TErpProcurementCommission> collect2 = null;
+ switch (query.getType()) {
+ case 1:
+ // procurementList算出今日的
+ collect = procurementList.stream().filter(procurement -> procurement.getPayTime().toLocalDate().isEqual(LocalDate.now())).collect(Collectors.toList());
+ collect2 = list1.stream().filter(commission -> commission.getCreateTime().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());
+ collect2 = list1.stream().filter(commission -> commission.getCreateTime().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());
+ collect2 = list1.stream().filter(commission -> commission.getCreateTime().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());
+ collect2 = list1.stream().filter(commission -> commission.getCreateTime().toLocalDate().isAfter(LocalDate.now().minusMonths(6))).collect(Collectors.toList());
+ break;
+ case 5:
+ // 最近一年
+ collect = procurementList;
+ collect2 = list1;
+ break;
+ }
+ branchAdminStatisticsOneVo.setOrderCount(collect.size());
+ branchAdminStatisticsOneVo.setMoneyProcurement(collect.stream().map(TErpProcurement::getPayMoney).reduce(BigDecimal.ZERO, BigDecimal::add));
+ branchAdminStatisticsOneVo.setBranchMoney(collect2.stream().map(TErpProcurementCommission::getMoney).filter(Objects::nonNull).reduce(BigDecimal::add).orElse(BigDecimal.ZERO));
+
+
+ // 获取公司业务员
+ List<String> salesIds = crmSalespersonService.list(new LambdaQueryWrapper<TCrmSalesperson>().eq(TCrmSalesperson::getBranchId, branch.getId())).stream().map(TCrmSalesperson::getId).collect(Collectors.toList());
+ if (salesIds.isEmpty()) {
+ salesIds.add("0");
+ }
+ List<TErpProcurementCommission> list3 = erpProcurementCommissionService.list(new LambdaQueryWrapper<TErpProcurementCommission>().in(TErpProcurementCommission::getBranchSalespersonId, salesIds).eq(TErpProcurementCommission::getCommissionType, 2).between(TErpProcurementCommission::getCreateTime, DateUtils.localDateTimeToDate(time), DateUtils.localDateTimeToDate(LocalDateTime.now())));
+
+ List<TErpProcurement> collect1 = null;
+ List<TErpProcurementCommission> collect3 = null;
+ switch (query.getStaffType()) {
+ case 1:
+ // procurementList算出今日的
+ collect1 = procurementList.stream().filter(procurement -> procurement.getPayTime().toLocalDate().isEqual(LocalDate.now())).collect(Collectors.toList());
+ collect3 = list3.stream().filter(commission -> commission.getCreateTime().toLocalDate().isEqual(LocalDate.now())).collect(Collectors.toList());
+ break;
+ case 2:
+ // procurementList算出昨天的
+ collect1 = procurementList.stream().filter(procurement -> procurement.getPayTime().toLocalDate().isEqual(LocalDate.now().minusDays(1))).collect(Collectors.toList());
+ collect3 = list3.stream().filter(commission -> commission.getCreateTime().toLocalDate().isEqual(LocalDate.now().minusDays(1))).collect(Collectors.toList());
+ break;
+ case 3:
+ // 最近7天的
+ collect1 = procurementList.stream().filter(procurement -> procurement.getPayTime().toLocalDate().isAfter(LocalDate.now().minusDays(7))).collect(Collectors.toList());
+ collect3 = list3.stream().filter(commission -> commission.getCreateTime().toLocalDate().isAfter(LocalDate.now().minusDays(7))).collect(Collectors.toList());
+ break;
+ case 4:
+ // 最近半年
+ collect1 = procurementList.stream().filter(procurement -> procurement.getPayTime().toLocalDate().isAfter(LocalDate.now().minusMonths(6))).collect(Collectors.toList());
+ collect3 = list3.stream().filter(commission -> commission.getCreateTime().toLocalDate().isAfter(LocalDate.now().minusMonths(6))).collect(Collectors.toList());
+ break;
+ case 5:
+ // 最近一年
+ collect1 = procurementList;
+ collect3 = list3;
+ break;
+ }
+
+ branchAdminStatisticsOneVo.setStaffOrderCount(collect1.size());
+ branchAdminStatisticsOneVo.setStaffMoneyProcurement(collect1.stream().map(TErpProcurement::getPayMoney).reduce(BigDecimal.ZERO, BigDecimal::add));
+ branchAdminStatisticsOneVo.setStaffMoney(collect3.stream().map(TErpProcurementCommission::getMoney).filter(Objects::nonNull).reduce(BigDecimal::add).orElse(BigDecimal.ZERO));
+
+ long count = crmSalespersonService.count(new LambdaQueryWrapper<TCrmSalesperson>().eq(TCrmSalesperson::getBranchId, branch.getId()));
+ branchAdminStatisticsOneVo.setStaffCount((int) count);
+ }
+
+
+ }
+ }
+
+ }
+ return R.ok(branchAdminStatisticsOneVo);
+
+ }
+
+
+ /**
+ * 分公司管理员-首页统计(第二部分)
+ */
+ @ApiOperation(value = "分公司管理员-首页统计(第二部分)")
+ @PostMapping(value = "/branchAdminStatisticsTwo")
+ public R<BranchAdminStatisticsTwoVo> branchAdminStatisticsTwo(@RequestBody @Validated BranchAdminStatisticsTwoQuery query) {
+ BranchAdminStatisticsTwoVo branchAdminStatisticsTwoVo = new BranchAdminStatisticsTwoVo();
+ SysUser user = tokenService.getLoginUser().getUser();
+ Integer roleType = user.getRoleType();
+ if (roleType == 2) {
+ TCrmBranch branch = crmBranchService.getOne(Wrappers.lambdaQuery(TCrmBranch.class)
+ .eq(TCrmBranch::getUserId, user.getUserId())
+ .last("LIMIT 1"));
+ if (branch != null) {
+ LambdaQueryWrapper<TCrmClinic> eq = Wrappers.lambdaQuery(TCrmClinic.class);
+ if (query.getSalespersonId() != null && !query.getSalespersonId().isEmpty()) {
+ eq.eq(TCrmClinic::getSalespersonId, query.getSalespersonId());
+ } else {
+ eq.eq(TCrmClinic::getBranchId, branch.getId());
+ }
+
+ List<TCrmClinic> list = crmClinicService.list(eq);
+ branchAdminStatisticsTwoVo.setClinicNum(list.size());
+
+ // 金额
+ ArrayList<SupplierThirtyMoneyProcurementStatisticsVO> moneyProcurementStatisticsVOS = new ArrayList<>();
+ ArrayList<SupplierThirtyProcurementStatisticsVO> orderProcurementStatisticsVOS = new ArrayList<>();
+
+ List<String> crmClinicIds = list.stream().map(TCrmClinic::getId).collect(Collectors.toList());
+ if (crmClinicIds.isEmpty()) {
+ crmClinicIds.add("0");
+ }
+ // 获取最近一年的时间
+ LocalDateTime time = LocalDateTime.now().minusYears(1);
+ 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, crmClinicIds));
+
+ if (!list.isEmpty()) {
+ if (!procurementList.isEmpty()) {
+ 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;
+ }
+ branchAdminStatisticsTwoVo.setOrderCount(collect.size());
+ branchAdminStatisticsTwoVo.setMoneyProcurement(collect.stream().map(TErpProcurement::getPayMoney).reduce(BigDecimal.ZERO, BigDecimal::add));
+ }
+ }
+
+
+ List<TErpProcurement> collect = procurementList.stream().filter(procurement -> procurement.getPayTime().toLocalDate().isAfter(LocalDate.now().minusDays(30))).collect(Collectors.toList());
+ for (int i = 29; i >= 0; i--) {
+ String string = LocalDate.now().minusDays(i).toString();
+ SupplierThirtyMoneyProcurementStatisticsVO thirtyMoneyProcurementStatisticsVO = new SupplierThirtyMoneyProcurementStatisticsVO();
+ thirtyMoneyProcurementStatisticsVO.setTime(string);
+ thirtyMoneyProcurementStatisticsVO.setMoneyTotal(collect.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) collect.stream().filter(procurement -> procurement.getPayTime().toLocalDate().isEqual(LocalDate.parse(string))).count());
+ orderProcurementStatisticsVOS.add(thirtyProcurementStatisticsVO);
+
+ }
+ branchAdminStatisticsTwoVo.setThirtyMoneyProcurementStatisticsVOS(moneyProcurementStatisticsVOS);
+ branchAdminStatisticsTwoVo.setThirtyProcurementStatisticsVOS(orderProcurementStatisticsVOS);
+
+ }
+
+ }
+ return R.ok(branchAdminStatisticsTwoVo);
+
+ }
+
+
+ @ApiOperation(value = "分公司管理员-首页统计(第三部分)")
+ @PostMapping(value = "/branchAdminStatisticsThree")
+ public R<BranchAdminStatisticsThreeVo> branchAdminStatisticsThree(@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 == 2) {
+ TCrmBranch branch = crmBranchService.getOne(Wrappers.lambdaQuery(TCrmBranch.class)
+ .eq(TCrmBranch::getUserId, user.getUserId())
+ .last("LIMIT 1"));
+ if (branch != null) {
+ LambdaQueryWrapper<TCrmClinic> eq = Wrappers.lambdaQuery(TCrmClinic.class);
+ eq.eq(TCrmClinic::getBranchId, branch.getId());
+ 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);
+
+ }
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TErpProcurementController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TErpProcurementController.java
index 2060448..9c88fb6 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TErpProcurementController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TErpProcurementController.java
@@ -267,7 +267,7 @@
@ApiOperation(value = "采购详情入库")
@PostMapping(value = "/updateStatusProcurement")
- public R<DetailProcurementVO> updateStatusProcurement(@RequestParam @Valid UpdateStatusProcurementLastDto dto) {
+ public R<DetailProcurementVO> updateStatusProcurement(@RequestBody @Valid UpdateStatusProcurementLastDto dto) {
SysUser user = tokenService.getLoginUser().getUser();
Integer roleType = user.getRoleType();
String clinicSupplierId=null;
@@ -287,6 +287,8 @@
return R.fail("目前状态无法入库");
}
erpProcurement.setStatus(5);
+ erpProcurement.setWarehousingUserId(user.getUserId().toString());
+ erpProcurement.setWarehousingTime(LocalDateTime.now());
erpProcurementService.updateById(erpProcurement);
List<String> collect = dto.getList().stream().map(UpdateStatusProcurementDto::getId).collect(Collectors.toList());
@@ -399,7 +401,7 @@
tErpProcurementCommission.setProcurementId(erpProcurement.getId());
tErpProcurementCommission.setCommissionType(1);
tErpProcurementCommission.setBranchSalespersonId(branchId);
- tErpProcurementCommission.setMoney(commission.doubleValue());
+ tErpProcurementCommission.setMoney(commission);
erpProcurementCommissionService.save(tErpProcurementCommission);
}
@@ -428,7 +430,7 @@
tErpProcurementCommission.setProcurementId(erpProcurement.getId());
tErpProcurementCommission.setCommissionType(2);
tErpProcurementCommission.setBranchSalespersonId(salespersonId);
- tErpProcurementCommission.setMoney(commission.doubleValue());
+ tErpProcurementCommission.setMoney(commission);
erpProcurementCommissionService.save(tErpProcurementCommission);
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/dto/UpdateStatusProcurementDto.java b/ruoyi-system/src/main/java/com/ruoyi/system/dto/UpdateStatusProcurementDto.java
index 67ad985..fdc1678 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/dto/UpdateStatusProcurementDto.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/dto/UpdateStatusProcurementDto.java
@@ -1,5 +1,6 @@
package com.ruoyi.system.dto;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -27,10 +28,12 @@
@ApiModelProperty(value = "生产日期")
@NotNull(message = "生产日期不能为空")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime productionDate;
@ApiModelProperty(value = "有效日期")
@NotNull(message = "有效日期不能为空")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime expiryDate;
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TErpProcurementMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TErpProcurementMapper.java
index 8376d8c..d9a7486 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TErpProcurementMapper.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TErpProcurementMapper.java
@@ -4,6 +4,7 @@
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.system.model.TErpProcurement;
+import com.ruoyi.system.model.TErpProcurementGoods;
import com.ruoyi.system.query.TErpGoodsQuery;
import com.ruoyi.system.query.TErpProcurementQuery;
import com.ruoyi.system.vo.*;
@@ -87,4 +88,6 @@
@Param("endTime")String endTime,
@Param("goodsName")String goodsName);
+ List<TErpProcurementGoods> branchAdminStatisticsThree(@Param("clinicIds") List<String> clinicIds);
+
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TSysOrderMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TSysOrderMapper.java
index 591b134..094c06e 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TSysOrderMapper.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TSysOrderMapper.java
@@ -34,9 +34,9 @@
List<TSysOrderPageVo> pageList(@Param("page") PageInfo<TSysOrderPageVo> page, @Param("query") TSysOrderQuery query, @Param("sTime") String sTime, @Param("eTime") String eTime);
- Integer clinicSalesStatisticsCount(@Param("clinicId")String clinicId);
+ Integer clinicSalesStatisticsCount(@Param("clinicIds")List<String> clinicIds);
- Integer clinicSalesStatisticsTypeCount(@Param("clinicId")String clinicId);
+ Integer clinicSalesStatisticsTypeCount(@Param("clinicIds")List<String> clinicIds);
BigDecimal clinicSalesStatisticsMoney(@Param("clinicId")String clinicId,
@Param("startTime")String startTime,
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/TErpProcurement.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/TErpProcurement.java
index a0a4865..980f5a5 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/model/TErpProcurement.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/TErpProcurement.java
@@ -70,6 +70,11 @@
@ApiModelProperty(value = "入库操作人")
private String warehousingUserId;
+ @ApiModelProperty(value = "入库时间")
+ @TableField("warehousing_time")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private LocalDateTime warehousingTime;
+
@ApiModelProperty(value = "支付时间")
@TableField("pay_time")
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/TErpProcurementCommission.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/TErpProcurementCommission.java
index 2c4de25..9b10f14 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/model/TErpProcurementCommission.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/TErpProcurementCommission.java
@@ -10,6 +10,7 @@
import lombok.EqualsAndHashCode;
import java.io.Serializable;
+import java.math.BigDecimal;
import java.time.LocalDateTime;
/**
@@ -45,7 +46,7 @@
@ApiModelProperty(value = "金额")
@TableField("money")
- private Double money;
+ private BigDecimal money;
@ApiModelProperty(value = "添加时间")
@TableField("create_time")
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/TErpProcurementGoods.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/TErpProcurementGoods.java
index d5b118c..485e144 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/model/TErpProcurementGoods.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/TErpProcurementGoods.java
@@ -9,6 +9,7 @@
import java.io.Serializable;
import java.math.BigDecimal;
+import java.time.LocalDate;
import java.time.LocalDateTime;
/**
@@ -91,6 +92,12 @@
private String recvNo;
+ @TableField(exist = false)
+ private BigDecimal payMoney;
+
+
+ @TableField(exist = false)
+ private LocalDateTime payTime;
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/query/BranchAdminStatisticsOneQuery.java b/ruoyi-system/src/main/java/com/ruoyi/system/query/BranchAdminStatisticsOneQuery.java
new file mode 100644
index 0000000..e846ac5
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/query/BranchAdminStatisticsOneQuery.java
@@ -0,0 +1,18 @@
+package com.ruoyi.system.query;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+@Data
+@ApiModel("分公司管理员-首页统计第一部分Query")
+public class BranchAdminStatisticsOneQuery {
+ @ApiModelProperty("1:今天 2：昨日 3:最近7天 4:最近半年 5：最近一年")
+ @NotNull(message = "请选择时间类型")
+ private Integer type;
+ @ApiModelProperty("1:今天 2：昨日 3:最近7天 4:最近半年 5：最近一年")
+ @NotNull(message = "请选择员工时间类型")
+ private Integer staffType;
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/query/BranchAdminStatisticsThreeQuery.java b/ruoyi-system/src/main/java/com/ruoyi/system/query/BranchAdminStatisticsThreeQuery.java
new file mode 100644
index 0000000..ff5db11
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/query/BranchAdminStatisticsThreeQuery.java
@@ -0,0 +1,18 @@
+package com.ruoyi.system.query;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+@Data
+@ApiModel("分公司管理员-首页统计第二部分Query")
+public class BranchAdminStatisticsThreeQuery {
+ @ApiModelProperty("1:今天 2：昨日 3:最近7天 4:最近半年 5：最近一年")
+ @NotNull(message = "请选择时间类型")
+ private Integer type;
+
+ @ApiModelProperty("药品名称")
+ private String name;
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/query/BranchAdminStatisticsTwoQuery.java b/ruoyi-system/src/main/java/com/ruoyi/system/query/BranchAdminStatisticsTwoQuery.java
new file mode 100644
index 0000000..2a277a9
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/query/BranchAdminStatisticsTwoQuery.java
@@ -0,0 +1,18 @@
+package com.ruoyi.system.query;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+@Data
+@ApiModel("分公司管理员-首页统计第二部分Query")
+public class BranchAdminStatisticsTwoQuery {
+ @ApiModelProperty("1:今天 2：昨日 3:最近7天 4:最近半年 5：最近一年")
+ @NotNull(message = "请选择时间类型")
+ private Integer type;
+
+ @ApiModelProperty("业务员id")
+ private String salespersonId;
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/TErpProcurementService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/TErpProcurementService.java
index 5a96425..62a228f 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/TErpProcurementService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/TErpProcurementService.java
@@ -6,6 +6,7 @@
import com.ruoyi.system.dto.AddProcurementDto;
import com.ruoyi.system.model.TErpGoods;
import com.ruoyi.system.model.TErpProcurement;
+import com.ruoyi.system.model.TErpProcurementGoods;
import com.ruoyi.system.query.TErpGoodsQuery;
import com.ruoyi.system.query.TErpProcurementQuery;
import com.ruoyi.system.vo.*;
@@ -112,4 +113,12 @@
* @return
*/
List<SupplierSalesStatisticsGoodsCountVO> supplierSalesStatisticsGoodsCountMonth(String supplierId, String startTime, String endTime, String goodsName);
+
+ /**
+ * 诊所下所有的采购订单详情数据
+ * @param clinicIds 诊所id集合
+ * @return
+ */
+ List<TErpProcurementGoods> branchAdminStatisticsThree(List<String> clinicIds);
+
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/TSysOrderService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/TSysOrderService.java
index 8a3741b..e5d632a 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/TSysOrderService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/TSysOrderService.java
@@ -37,9 +37,9 @@
void add(TSysOrderDto dto, TCrmClinic crmClinic);
- Integer clinicSalesStatisticsCount(String clinicId);
+ Integer clinicSalesStatisticsCount(List<String> clinicIds);
- Integer clinicSalesStatisticsTypeCount(String clinicId);
+ Integer clinicSalesStatisticsTypeCount(List<String> clinicIds);
BigDecimal clinicSalesStatisticsMoney(String clinicId, String startTime, String endTime);
@@ -48,4 +48,5 @@
List<ClinicSalesStatisticsGoodsCountVO> supplierSalesStatisticsGoodsCount(String clinicId, String startTime, String endTime, String goodsName);
List<ClinicSalesStatisticsGoodsCountVO> supplierSalesStatisticsGoodsCountMonth(String clinicId, String startTime, String endTime, String goodsName);
+
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TErpClinicWarehousingServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TErpClinicWarehousingServiceImpl.java
index 587e81a..e8fe9f1 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TErpClinicWarehousingServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TErpClinicWarehousingServiceImpl.java
@@ -266,8 +266,8 @@
.last("LIMIT 1"));
supplierClinicId = crmClinic.getId();
}
- // 获取当前时间后9个月的时间
- LocalDateTime nineMonthLater = LocalDateTime.now().plusMonths(9);
+ // 获取当前时间后1个月的时间
+ LocalDateTime nineMonthLater = LocalDateTime.now().plusMonths(1);
PageInfo<ValidityPeriodWarningVo> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
@@ -410,7 +410,7 @@
}
- totalPrice = totalPrice.add(dto.getSalesAmount().multiply(new BigDecimal(dto.getPurchaseCount())));
+ totalPrice = totalPrice.add(dto.getUnitAmount().multiply(new BigDecimal(dto.getPurchaseCount())));
}
tErpClinicWarehousing.setTotalPrice(totalPrice);
String name = names.stream().collect(Collectors.joining(","));
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TErpProcurementServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TErpProcurementServiceImpl.java
index 0ff98fd..3033e10 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TErpProcurementServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TErpProcurementServiceImpl.java
@@ -46,6 +46,7 @@
import java.security.cert.X509Certificate;
import java.time.LocalDateTime;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
@@ -102,6 +103,7 @@
@Resource
private TCrmWarehouseMapper crmWarehouseMapper;
+
@Override
public PageInfo<TErpProcurementVo> pageList(TErpProcurementQuery query, SysUser user) {
@@ -187,7 +189,11 @@
sTime = split[0] + " 00:00:00";
eTime = split[1] + " 23:59:59";
}
+
PageInfo<TErpProcurementVo> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
+ if(supplierClinicId.isEmpty()){
+ return pageInfo;
+ }
List<TErpProcurementVo> list = this.baseMapper.pageListWarehouse(query, pageInfo, user, sTime, eTime, supplierClinicId);
// if (list.isEmpty()) {
// return pageInfo;
@@ -443,6 +449,13 @@
public DetailProcurementVO detailProcurement(String clinicSupplierId, SysUser user, String id) {
DetailProcurementVO detailProcurementVO = new DetailProcurementVO();
TErpProcurement tErpProcurement = this.getById(id);
+ if (tErpProcurement.getWarehousingUserId()!=null && !tErpProcurement.getWarehousingUserId().isEmpty()) {
+ SysUser sysUser = sysUserMapper.selectUserById(Long.valueOf(tErpProcurement.getWarehousingUserId()));
+ detailProcurementVO.setWarehousingUserName(sysUser.getUserName());
+ }
+ detailProcurementVO.setWarehousingTime(tErpProcurement.getWarehousingTime());
+
+
detailProcurementVO.setStatus(tErpProcurement.getStatus());
detailProcurementVO.setCreateTime(tErpProcurement.getCreateTime());
detailProcurementVO.setSendTime(tErpProcurement.getSendTime());
@@ -638,4 +651,9 @@
return this.baseMapper.supplierSalesStatisticsGoodsCountMonth(supplierId,startTime, endTime,goodsName);
}
+ @Override
+ public List<TErpProcurementGoods> branchAdminStatisticsThree(List<String> clinicIds) {
+ return this.baseMapper.branchAdminStatisticsThree(clinicIds);
+ }
+
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TSysOrderServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TSysOrderServiceImpl.java
index ebb9ffb..95ef667 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TSysOrderServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TSysOrderServiceImpl.java
@@ -161,13 +161,13 @@
}
@Override
- public Integer clinicSalesStatisticsCount(String clinicId) {
- return this.baseMapper.clinicSalesStatisticsCount(clinicId);
+ public Integer clinicSalesStatisticsCount(List<String> clinicIds) {
+ return this.baseMapper.clinicSalesStatisticsCount(clinicIds);
}
@Override
- public Integer clinicSalesStatisticsTypeCount(String clinicId) {
- return this.baseMapper.clinicSalesStatisticsTypeCount(clinicId);
+ public Integer clinicSalesStatisticsTypeCount(List<String> clinicIds) {
+ return this.baseMapper.clinicSalesStatisticsTypeCount(clinicIds);
}
@Override
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/vo/BranchAdminStatisticsOneVo.java b/ruoyi-system/src/main/java/com/ruoyi/system/vo/BranchAdminStatisticsOneVo.java
new file mode 100644
index 0000000..607d506
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/vo/BranchAdminStatisticsOneVo.java
@@ -0,0 +1,37 @@
+package com.ruoyi.system.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+@ApiModel("分公司管理员-首页统计第一部分Vo")
+public class BranchAdminStatisticsOneVo {
+ @ApiModelProperty(value = "本月业绩")
+ private BigDecimal monthMoney=BigDecimal.ZERO;
+
+ @ApiModelProperty(value = "订单数")
+ private Integer orderCount=0;
+
+ @ApiModelProperty(value = "采购总金额")
+ private BigDecimal moneyProcurement=BigDecimal.ZERO;
+
+ @ApiModelProperty(value = "分公司业绩")
+ private BigDecimal branchMoney=BigDecimal.ZERO;
+
+ @ApiModelProperty(value = "员工数")
+ private Integer staffCount=0;
+
+ @ApiModelProperty(value = "员工订单数")
+ private Integer staffOrderCount=0;
+
+ @ApiModelProperty(value = "员工采购总金额")
+ private BigDecimal staffMoneyProcurement=BigDecimal.ZERO;
+
+ @ApiModelProperty(value = "员工业绩")
+ private BigDecimal staffMoney=BigDecimal.ZERO;
+
+
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/vo/BranchAdminStatisticsThreeVo.java b/ruoyi-system/src/main/java/com/ruoyi/system/vo/BranchAdminStatisticsThreeVo.java
new file mode 100644
index 0000000..a1b9118
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/vo/BranchAdminStatisticsThreeVo.java
@@ -0,0 +1,29 @@
+package com.ruoyi.system.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+@Data
+@ApiModel("分公司管理员-首页统计第三部分Vo")
+public class BranchAdminStatisticsThreeVo {
+ @ApiModelProperty(value = "药品总类数")
+ private Integer goodsTypeCount=0;
+
+ @ApiModelProperty(value = "药品总数")
+ private Integer goodsCount=0;
+
+ @ApiModelProperty(value = "药品销售额度")
+ private BigDecimal moneyProcurement=BigDecimal.ZERO;
+
+
+ @ApiModelProperty(value = "销售前十占比")
+ private List<ClinicSalesStatisticsGoodsTypeVO> thirtyMoneyProcurementStatisticsVOS;
+
+ @ApiModelProperty(value = "30天数据统计")
+ private List<ProcurementStatisticsVO> thirtyProcurementStatisticsVOS;
+
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/vo/BranchAdminStatisticsTwoVo.java b/ruoyi-system/src/main/java/com/ruoyi/system/vo/BranchAdminStatisticsTwoVo.java
new file mode 100644
index 0000000..2fcc216
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/vo/BranchAdminStatisticsTwoVo.java
@@ -0,0 +1,29 @@
+package com.ruoyi.system.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+@Data
+@ApiModel("分公司管理员-首页统计第二部分Vo")
+public class BranchAdminStatisticsTwoVo {
+ @ApiModelProperty(value = "诊所数")
+ private Integer clinicNum=0;
+
+ @ApiModelProperty(value = "订单数")
+ private Integer orderCount=0;
+
+ @ApiModelProperty(value = "采购总金额")
+ private BigDecimal moneyProcurement=BigDecimal.ZERO;
+
+
+ @ApiModelProperty(value = "30天总金额统计")
+ private List<SupplierThirtyMoneyProcurementStatisticsVO> thirtyMoneyProcurementStatisticsVOS;
+
+ @ApiModelProperty(value = "30天订单数统计")
+ private List<SupplierThirtyProcurementStatisticsVO> thirtyProcurementStatisticsVOS;
+
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/vo/DetailProcurementVO.java b/ruoyi-system/src/main/java/com/ruoyi/system/vo/DetailProcurementVO.java
index 75ac8b1..cd17e09 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/vo/DetailProcurementVO.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/vo/DetailProcurementVO.java
@@ -1,5 +1,7 @@
package com.ruoyi.system.vo;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.system.model.TErpGoods;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -36,9 +38,17 @@
@ApiModelProperty(value = "物流单号")
private String logisticsNumber;
+ @ApiModelProperty(value = "入库人")
+ private String warehousingUserName;
+
+ @ApiModelProperty(value = "入库时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private LocalDateTime warehousingTime;
+
@ApiModelProperty(value = "采购二级详情")
private List<DetailProcurementNextVO> list;
+
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/vo/ProcurementStatisticsVO.java b/ruoyi-system/src/main/java/com/ruoyi/system/vo/ProcurementStatisticsVO.java
new file mode 100644
index 0000000..baf7ade
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/vo/ProcurementStatisticsVO.java
@@ -0,0 +1,23 @@
+package com.ruoyi.system.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDate;
+
+@Data
+@ApiModel(value = "30天数据VO")
+public class ProcurementStatisticsVO implements Serializable {
+
+ @ApiModelProperty(value = "时间")
+ private String time;
+
+ @ApiModelProperty(value = "数量")
+ private Integer count;
+
+ @ApiModelProperty(value = "支付时间，前端忽略")
+ private LocalDate payTime;
+
+}
diff --git a/ruoyi-system/src/main/resources/mapper/system/TErpClinicWarehousingMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TErpClinicWarehousingMapper.xml
index c7365d5..403690d 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TErpClinicWarehousingMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TErpClinicWarehousingMapper.xml
@@ -64,7 +64,7 @@
and t2.clinic_id =#{supplierClinicId}
</if>
<if test="query.name != null and query.name != ''">
- and t4.goods_name like concat('%',#{query.goodsName},'%')
+ and t4.goods_name like concat('%',#{query.name},'%')
</if>
<if test="query.quasiNumber != null and query.quasiNumber != ''">
and t4.quasi_number like concat('%',#{query.quasiNumber},'%')
diff --git a/ruoyi-system/src/main/resources/mapper/system/TErpProcurementMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TErpProcurementMapper.xml
index a63da13..1a02c06 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TErpProcurementMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TErpProcurementMapper.xml
@@ -36,11 +36,15 @@
t1.create_time,
t2.id tErpProcurementGoodsId,
t4.user_name,
- t1.status
+ t1.status,
+ t1.supplier_money,
+ t1.money as platformMoney,
+ t5.clinic_name
from t_erp_procurement t1
left JOIN t_erp_procurement_goods t2 on t1.id = t2.procurement_id
LEFT JOIN t_crm_supplier t3 on t1.supplier_id = t3.id
left JOIN sys_user t4 on t1.create_id = t4.user_id
+ left join t_crm_clinic t5 on t1.clinic_id = t5.id
where t1.disabled = 0 and t1.status !=1
<if test="user.roleType !=null and user.roleType==4">
and t2.supplier_id =#{supplierClinicId}
@@ -109,6 +113,7 @@
<if test="query.status != null">
and t1.status = #{query.status}
</if>
+ order by t1.create_time desc
</select>
@@ -220,5 +225,16 @@
</if>
group by date_format(t1.pay_time, '%Y.%m')
</select>
+ <select id="branchAdminStatisticsThree" resultType="com.ruoyi.system.model.TErpProcurementGoods">
+ select t2.goods_id,t2.goods_name,t2.purchase_count as purchaseCount,t1.pay_time as payTime,t1.pay_money
+ from t_erp_procurement t1
+ left join t_erp_procurement_goods t2 on t1.id = t2.procurement_id
+ where t1.disabled = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()}
+ and t1.status in (3,4,5)
+ and t1.clinic_id in
+ <foreach item="item" collection="clinicIds" separator="," open="(" close=")">
+ #{item}
+ </foreach>
+ </select>
</mapper>
diff --git a/ruoyi-system/src/main/resources/mapper/system/TSysOrderMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TSysOrderMapper.xml
index a5c39e3..6ccf7fd 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TSysOrderMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TSysOrderMapper.xml
@@ -51,7 +51,7 @@
left join t_sys_order_goods tsog on tso.id = tsog.order_id
left join t_erp_goods teg on tepg.goods_id = teg.id
where tso.disabled = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()}
- and tso.clinic_id = #{clinicId}
+ and tso.clinic_id in <foreach collection="clinicIds" open="(" separator="," item="id" close=")">#{id}</foreach>
</select>
<select id="clinicSalesStatisticsTypeCount" resultType="java.lang.Integer">
select count(1)
@@ -59,7 +59,7 @@
left join t_sys_order_goods tsog on tso.id = tsog.order_id
left join t_erp_goods teg on tepg.goods_id = teg.id
where tso.disabled = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()}
- and tso.clinic_id = #{clinicId}
+ and tso.clinic_id in <foreach collection="clinicIds" open="(" separator="," item="id" close=")">#{id}</foreach>
group by teg.type_id
</select>
<select id="clinicSalesStatisticsMoney" resultType="java.math.BigDecimal">
--
Gitblit v1.7.1