From 6659135780e718758417efde4c8c351c69e3755b Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期四, 11 十二月 2025 15:52:19 +0800
Subject: [PATCH] 代码提交

---
 smartor/src/main/java/com/smartor/domain/ServiceSubtaskStatistic.java |   37 +++++++++++++++++++++++++++++++++----
 1 files changed, 33 insertions(+), 4 deletions(-)

diff --git a/smartor/src/main/java/com/smartor/domain/ServiceSubtaskStatistic.java b/smartor/src/main/java/com/smartor/domain/ServiceSubtaskStatistic.java
index b98759a..3d6597e 100644
--- a/smartor/src/main/java/com/smartor/domain/ServiceSubtaskStatistic.java
+++ b/smartor/src/main/java/com/smartor/domain/ServiceSubtaskStatistic.java
@@ -5,6 +5,9 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.io.Serializable;
+import java.util.List;
+
 /**
  * 鍚勭梾鍖洪殢璁跨粺璁℃瘮渚�
  *
@@ -13,7 +16,7 @@
  */
 @ApiModel(value = "ServiceSubtaskStatistic", description = "鍚勭梾鍖洪殢璁跨粺璁℃瘮渚�")
 @Data
-public class ServiceSubtaskStatistic {
+public class ServiceSubtaskStatistic implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty(value = "鏈嶅姟鎬婚噺")
@@ -90,6 +93,10 @@
     @ApiModelProperty(value = "鏃犻渶闅忚浜烘")
     @Excel(name = " 鏃犻渶闅忚浜烘 ")
     private Long nonFollowUp = 0L;
+
+    @ApiModelProperty(value = "杩囨护鎮h��")
+    @Excel(name = " 杩囨护鎮h�� ")
+    private Long filterCount = 0L;
 
     @ApiModelProperty(value = "搴旈殢璁夸汉娆�")
     @Excel(name = " 搴旈殢璁夸汉娆� ")
@@ -181,11 +188,33 @@
     private String drname;
 
     @ApiModelProperty(value = "濉啓婊℃剰搴︽暟閲�")
-    private Integer joyCount=0;
+    private Integer joyCount = 0;
 
     @ApiModelProperty(value = "鎵�鏈夋弧鎰忓害鏁伴噺")
-    private Integer joyAllCount=0;
+    private Integer joyAllCount = 0;
 
     @ApiModelProperty(value = "婊℃剰搴︽瘮渚�")
-    private String joyTotal="";
+    private Double joyTotal = 0.00;
+
+    @ApiModelProperty(value = "闅忚鎯呭喌:1姝e父璇煶")
+    private Integer taskSituation1 = 0;
+
+    @ApiModelProperty(value = "闅忚鎯呭喌:2鎮h�呮嫆鎺ユ垨鎷掕")
+    private Integer taskSituation2 = 0;
+
+    @ApiModelProperty(value = "闅忚鎯呭喌:3闈㈣鎴栬�呮帴璇�")
+    private Integer taskSituation3 = 0;
+
+    @ApiModelProperty(value = "闅忚鎯呭喌:4寰俊闅忚")
+    private Integer taskSituation4 = 0;
+
+    @ApiModelProperty(value = "闅忚鎯呭喌:5闅忚鐢佃瘽涓嶆纭�")
+    private Integer taskSituation5 = 0;
+
+    @ApiModelProperty(value = "闅忚鎯呭喌:7鍏朵粬")
+    private Integer taskSituation6 = 0;
+
+    @ApiModelProperty(value = "杩囨护鎮h�呰鎯�")
+    private List<ServiceSubtask> filterCountList;
+
 }

--
Gitblit v1.9.3