From 1d064aa5ec2556155bbf116cef1d6d0ac5007acc Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期一, 29 九月 2025 10:23:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao
---
server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/WholeProvinceBoardVO.java | 81 +++++++++++-----------------------------
1 files changed, 22 insertions(+), 59 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/WholeProvinceBoardVO.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/WholeProvinceBoardVO.java
index 8becde0..2b2afa4 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/WholeProvinceBoardVO.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/WholeProvinceBoardVO.java
@@ -15,69 +15,32 @@
@Data
public class WholeProvinceBoardVO {
- @ApiModelProperty(value = "绱鍑哄簱閲� - 骞村害")
- private BigDecimal yearOutTotal;
+ @ApiModelProperty(value = "銆愬嚭搴撹兘鍔涖�戝綋鏃ヨ鍗曢噷")
+ private BigDecimal currentOrderNum;
+ @ApiModelProperty(value = "銆愬嚭搴撹兘鍔涖�戝綋鏃ヨ鍒掗噺锛堝悓鍩庡叡搴撲换鍔￠噺+杩愯緭浠诲姟閲忥級")
+ private BigDecimal currentPlanNum;
+ @ApiModelProperty(value = "銆愬嚭搴撹兘鍔涖�戞棤闇�閰嶈浇鐨勪换鍔￠噺(鍚屽煄鍏卞簱浠诲姟閲�)")
+ private BigDecimal noNeedTransportOrderNum;
+ @ApiModelProperty(value = "銆愬嚭搴撹兘鍔涖�戦渶閰嶈浇鐨勪换鍔￠噺锛堣繍杈撲换鍔￠噺锛�")
+ private BigDecimal needTransportOrderNum;
+ @ApiModelProperty(value = "銆愬嚭搴撹兘鍔涖�戝綋鍓嶄换鍔¤溅娆�")
+ private int currentPlanCarNum;
- @ApiModelProperty(value = "绱鍑哄簱閲� - 骞村害鍚屾瘮")
- private BigDecimal yearOutTotalOnYear;
+ @ApiModelProperty(value = "銆愬嚭搴撹兘鍔涖�戜粖鏃ュ嚭搴撻噺")
+ private BigDecimal crrentOutNum;
+ @ApiModelProperty(value = "銆愬嚭搴撹兘鍔涖�戜粖鏃ュ嚭搴撹溅娆￠噺")
+ private int crrentOutCarNum;
- @ApiModelProperty(value = "绱鍑哄簱杞︽ - 骞村害")
- private Integer yearOutTimes;
-
- @ApiModelProperty(value = "鐪佸唴鍗犳瘮")
- private BigDecimal yearProvinceRata;
+ @ApiModelProperty(value = "銆愬嚭搴撹兘鍔涖�戝墿浣欎换鍔￠噺锛堝悓褰撴棩璁″垝閲忥級")
+ private BigDecimal crrentRestNum;
+ @ApiModelProperty(value = "銆愬嚭搴撹兘鍔涖�戝墿浣欎换鍔¤溅娆￠噺")
+ private int crrentRestCarNum;
- @ApiModelProperty(value = "绱鍏ュ簱閲� - 骞村害")
- private BigDecimal yearInTotal;
+ @ApiModelProperty(value = "銆愬嚭搴撹兘鍔涖��8灏忔椂鍑哄簱鑳藉姏")
+ private BigDecimal hoursAbility;
- @ApiModelProperty(value = "绱鍏ュ簱閲� - 骞村害鍚屾瘮")
- private BigDecimal yearInTotalOnYear;
-
- @ApiModelProperty(value = "绱鍏ュ簱杞︽ - 骞村害")
- private Integer yearInTimes;
-
- @ApiModelProperty(value = "璁″垝鍏ュ簱閲� - 骞村害")
- private BigDecimal yearInPlanTotal;
-
-
-
- @ApiModelProperty(value = "浠婃棩璁″垝鍑哄簱閲�")
- private BigDecimal outPlanTotal;
-
- @ApiModelProperty(value = "浠婃棩璁″垝鍑哄簱娆℃暟")
- private Integer outPlanTimes;
-
- @ApiModelProperty(value = "浠婃棩鍑哄簱閲�")
- private BigDecimal outTotal;
-
- @ApiModelProperty(value = "浠婃棩鍑哄簱娆℃暟")
- private Integer outTimes;
-
- @ApiModelProperty(value = "鍑哄簱鑳藉姏鍗犳瘮")
- private BigDecimal outRata;
-
- @ApiModelProperty(value = "杩戜竷鏃ュ埌璐ф儏鍐�" , hidden = true)
- private List<ArriveGoodsVO> arriveGoodsList;
-
- @ApiModelProperty(value = "褰撳墠杩愯緭浠诲姟" , hidden = true)
- private List<TransportTaskVO> transportTaskList;
-
-
- @ApiModelProperty(value = "杩涢攢瀛樿繍钀� - 7鏃�" , hidden = true)
- private List<WholeProvinceZxtDetailVO> salesOperationWeekList;
-
- @ApiModelProperty(value = "杩涢攢瀛樿繍钀� - 鏈堝害" , hidden = true)
- private List<WholeProvinceZxtDetailVO> salesOperationMonthList;
-
- @ApiModelProperty(value = "杩涢攢瀛樿繍钀� - 骞村害" , hidden = true)
- private List<WholeProvinceZxtDetailVO> salesOperationYearList;
-
- @ApiModelProperty(value = "搴撳瓨鍒╃敤鐜�" , hidden = true)
- private List<StockRataVO> stockRataVOListList;
-
-
-
-
+ @ApiModelProperty(value = "銆愬嚭搴撹兘鍔涖�戞渶澶у嚭搴撹兘鍔�")
+ private BigDecimal maxAbility;
}
--
Gitblit v1.9.3