From c5f7cf883c94d92cf7ef575b1f73df1f810da7b6 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期二, 16 十二月 2025 10:59:50 +0800
Subject: [PATCH] 【丽水】writeInSubTask 增加回滚事务

---
 smartor/src/main/java/com/smartor/domain/ServiceSubtaskStatistic.java |   69 +++++++++++++++++++++++++++++++---
 1 files changed, 63 insertions(+), 6 deletions(-)

diff --git a/smartor/src/main/java/com/smartor/domain/ServiceSubtaskStatistic.java b/smartor/src/main/java/com/smartor/domain/ServiceSubtaskStatistic.java
index b185332..78786d3 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 = "鏈嶅姟鎬婚噺")
@@ -65,10 +68,6 @@
     @ApiModelProperty(value = "鍥炲寮傚父鏁�")
     private Long hfycs = 0L;
 
-    @ApiModelProperty(value = "鍙婃椂鐜�")
-    @Excel(name = " 鍙婃椂鐜� ")
-    private Double rate = 0.0;
-
     /**
      * 06-04鏂扮粺璁￠〉闈㈠瓧娈�
      */
@@ -95,6 +94,10 @@
     @Excel(name = " 鏃犻渶闅忚浜烘 ")
     private Long nonFollowUp = 0L;
 
+    @ApiModelProperty(value = "杩囨护鎮ｈ��")
+    @Excel(name = " 杩囨护鎮ｈ�� ")
+    private Long filterCount = 0L;
+
     @ApiModelProperty(value = "搴旈殢璁夸汉娆�")
     @Excel(name = " 搴旈殢璁夸汉娆� ")
     private Long followUpNeeded = 0L;
@@ -114,6 +117,22 @@
     @ApiModelProperty(value = "棣栨闅忚澶辫触")
     @Excel(name = " 棣栨闅忚澶辫触 ")
     private Long followUpFail = 0L;
+
+    @ApiModelProperty(value = "棣栨闅忚澶辫触璇︽儏")
+    private List<ServiceSubtask> followUpFailInfo;
+
+    @ApiModelProperty(value = "棣栨搴旈殢璁胯鎯�")
+    private List<ServiceSubtask> needFollowUpInfo;
+
+    @ApiModelProperty(value = "棣栨寰呴殢璁胯鎯�")
+    private List<ServiceSubtask> pendingFollowUpInfo;
+
+    @ApiModelProperty(value = "棣栨闅忚鎴愬姛璇︽儏")
+    private List<ServiceSubtask> followUpSuccessInfo;
+
+    @ApiModelProperty(value = "鍙婃椂鐜�")
+    @Excel(name = " 鍙婃椂鐜� ")
+    private Double rate = 0.0;
 
     @ApiModelProperty(value = "棣栨闅忚鐜�")
     @Excel(name = " 棣栨闅忚鐜� ")
@@ -161,9 +180,9 @@
     @ApiModelProperty(value = "浜屾鐭俊")
     @Excel(name = " 浜屾鐭俊 ")
     private Long smsAgain = 0L;
+    @Excel(name = " 浜屾寰俊 ")
 
     @ApiModelProperty(value = "浜屾寰俊")
-    @Excel(name = " 浜屾寰俊 ")
     private Long weChatAgain = 0L;
 
     @ApiModelProperty(value = "缁撴灉寮傚父")
@@ -172,4 +191,42 @@
 
     @ApiModelProperty(value = "绉戝鐥呭尯")
     private Integer statisticaltype;
+
+
+    @ApiModelProperty(value = "鍖荤敓缂栫爜")
+    private String drcode;
+
+    @ApiModelProperty(value = "鍖荤敓濮撳悕")
+    private String drname;
+
+    @ApiModelProperty(value = "濉啓婊℃剰搴︽暟閲�")
+    private Integer joyCount = 0;
+
+    @ApiModelProperty(value = "鎵�鏈夋弧鎰忓害鏁伴噺")
+    private Integer joyAllCount = 0;
+
+    @ApiModelProperty(value = "婊℃剰搴︽瘮渚�")
+    private Double joyTotal = 0.00;
+
+    @ApiModelProperty(value = "闅忚鎯呭喌:1姝ｅ父璇煶")
+    private Integer taskSituation1 = 0;
+
+    @ApiModelProperty(value = "闅忚鎯呭喌:2鎮ｈ�呮嫆鎺ユ垨鎷掕")
+    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 = "杩囨护鎮ｈ�呰鎯�")
+    private List<ServiceSubtask> filterCountList;
+
 }

--
Gitblit v1.9.3