From 963a8c24874c2e10a329a6ea39774bc5eda0f762 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期三, 25 三月 2026 15:02:56 +0800
Subject: [PATCH] 销售金额
---
jyz-base-start/src/main/java/com/tievd/jyz/entity/vo/DataStatisReqVo.java | 38 ++++++++++++++++++++++++++++++++------
1 files changed, 32 insertions(+), 6 deletions(-)
diff --git a/jyz-base-start/src/main/java/com/tievd/jyz/entity/vo/DataStatisReqVo.java b/jyz-base-start/src/main/java/com/tievd/jyz/entity/vo/DataStatisReqVo.java
index 3e63897..d1f7fa0 100644
--- a/jyz-base-start/src/main/java/com/tievd/jyz/entity/vo/DataStatisReqVo.java
+++ b/jyz-base-start/src/main/java/com/tievd/jyz/entity/vo/DataStatisReqVo.java
@@ -28,6 +28,18 @@
@Schema(description = "缁撴潫鏃堕棿")
private String endTime;
+
+ @Schema(description = "娲诲姩鍓嶅紑濮嬫椂闂�")
+ private String beforeStartTime;
+
+ @Schema(description = "娲诲姩鍓嶇粨鏉熸椂闂�")
+ private String beforeEndTime;
+
+ @Schema(description = "娲诲姩鍚庡紑濮嬫椂闂�")
+ private String afterStartTime;
+
+ @Schema(description = "娲诲姩鍚庣粨鏉熸椂闂�")
+ private String afterEndTime;
public void setOrgCodeIfnull(String orgCode) {
if (this.orgCode == null || this.orgCode.equals("")){
@@ -46,6 +58,12 @@
@Schema(description = "HOURS, DAYS, MONTHS")
private StatUnit timeUnit = StatUnit.HOURS;
+
+ @Schema(description = "瓒嬪娍鍥剧偣浣嶆椂闂�")
+ private String statTime;
+
+ @Schema(description = "瓒嬪娍鍥剧郴鍒楀悕绉�")
+ private String seriesName;
private DataStatisReqVo setTimeUnit(String timeUnit){
this.timeUnit = StatUnit.valueOf(timeUnit);
@@ -90,12 +108,20 @@
}
public enum TrendType {
- TRAFFIC(1, StatDataTableVo::getCarCount, StatDataTableVo::getEntryRate, "杞︽祦閲�", "鎷愬叆鐜�"),
- OIL(2, StatDataTableVo::getOilCount, StatDataTableVo::getOilVolume, "鍔犳补鏁�", "娌瑰搧閿�閲�"),
- OIL_vOLUME(3, StatDataTableVo::getOilVolume, t -> 100 * (t.getOilVolume() - t.getPreStatVo().getOilVolume()) / (t.getPreStatVo().getOilVolume() + 1), "娌瑰搧閿�閲�", "鐜瘮"),
- SPAND_AVG(4, StatDataTableVo::getSpandAvg, t -> 100 * (t.getSpandAvg() - t.getPreStatVo().getSpandAvg()) / (t.getPreStatVo().getSpandAvg() + 1), "閫氳繃鐜�", "鐜瘮"),
- CLIENT(5, null),
- LOSE_CLIENT(6, null);
+ TRAFFIC(0, StatDataTableVo::getCarCount, StatDataTableVo::getEntryRate, "杞︽祦閲�", "鎷愬叆鐜�"),
+ OIL(1, StatDataTableVo::getOilCount, StatDataTableVo::getOilVolume, "鍔犳补鏁�", "娌瑰搧閿�閲�"),
+ OIL_vOLUME(2, StatDataTableVo::getOilVolume, t -> 100 * (t.getOilVolume() - t.getPreStatVo().getOilVolume()) / (t.getPreStatVo().getOilVolume() + 1), "娌瑰搧閿�閲�", "鐜瘮"),
+ SPAND_AVG(3, StatDataTableVo::getSpandAvg, t -> 100 * (t.getSpandAvg() - t.getPreStatVo().getSpandAvg()) / (t.getPreStatVo().getSpandAvg() + 1), "閫氳繃鐜�", "鐜瘮"),
+ CLIENT(4, null),
+ LOSE_CLIENT(5, null),
+ SALES_AMOUNT(6, StatDataTableVo::getTotalAmount, t -> {
+ java.math.BigDecimal current = t.getTotalAmount();
+ java.math.BigDecimal previous = t.getPreStatVo().getTotalAmount();
+ if (previous.compareTo(java.math.BigDecimal.ZERO) == 0) {
+ return java.math.BigDecimal.ZERO;
+ }
+ return current.subtract(previous).multiply(new java.math.BigDecimal(100)).divide(previous, 2, java.math.RoundingMode.HALF_UP);
+ }, "閿�鍞噾棰�", "鐜瘮");
int val;
--
Gitblit v1.8.0