From eb845e8be695ed1280a7cbf854a4d1dedf9db30d Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期五, 30 十月 2026 15:02:55 +0800
Subject: [PATCH] 【丽水】/smartor/serviceSubtask/getSfStatisticsHyperlink 和 /smartor/serviceSubtask/getSfStatistics 统计的时候，对于 service_subtask.current_preachForm 为空的数据 当成 service_subtask.preachform 字符串的第一个执行方式、首次待随访全部(visitCount = 1 && sendstate in (1、2、3、7)) 区别于原先的待随访，这个是给市一使用的 再次待随访全部(visitCount > 1 && sendstate in (1、2、3、7)) 区别于原先的待随访，这个是给市一使用的 首次待随访待发送(visitCount = 1 && sendstate in (1、2)) 再次待随访待发送(visitCount > 1 && sendstate in (1、2)) 首次待随访已发送(visitCount = 1 && sendstate = in (3、7)) 再次待随访已发送(visitCount > 1 && sendstate = in (3、7)) 首次已发送(visitCount = 1 && sendstate = 3) 再次已发送(visitCount > 1 && sendstate = 3)
---
smartor/src/main/java/com/smartor/domain/ServiceSubtaskStatistic.java | 133 ++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 133 insertions(+), 0 deletions(-)
diff --git a/smartor/src/main/java/com/smartor/domain/ServiceSubtaskStatistic.java b/smartor/src/main/java/com/smartor/domain/ServiceSubtaskStatistic.java
index 7608a6a..918af60 100644
--- a/smartor/src/main/java/com/smartor/domain/ServiceSubtaskStatistic.java
+++ b/smartor/src/main/java/com/smartor/domain/ServiceSubtaskStatistic.java
@@ -90,6 +90,14 @@
@Excel(name = " 鍑洪櫌浜烘 ")
private Integer dischargeCount = 0;
+ @ApiModelProperty(value = "棣栨鍑洪櫌浜烘锛坴isitCount = 1锛�")
+ @Excel(name = " 棣栨鍑洪櫌浜烘 ")
+ private Long firstDischargeCount = 0L;
+
+ @ApiModelProperty(value = "鍐嶆闅忚鎺ㄩ�佷汉鏁帮紙棣栦釜鍐嶆闅忚涓旀墽琛岀瀹や负闅忚涓績锛夊啀娆￠殢璁挎帹閫佺巼锛堝啀娆￠殢璁挎帹閫佷汉鏁� / 棣栨鍑洪櫌浜烘锛�")
+ @Excel(name = " 鍐嶆闅忚鎺ㄩ�佷汉鏁� ")
+ private Long againFollowUpPushCount = 0L;
+
@ApiModelProperty(value = "鏃犻渶闅忚浜烘")
@Excel(name = " 鏃犻渶闅忚浜烘 ")
private Long nonFollowUp = 0L;
@@ -101,6 +109,13 @@
@ApiModelProperty(value = "搴旈殢璁夸汉娆�")
@Excel(name = " 搴旈殢璁夸汉娆� ")
private Long followUpNeeded = 0L;
+
+ @ApiModelProperty(value = "浜哄伐宸叉嫧閫氭�婚噺")
+ @Excel(name = " 浜哄伐宸叉嫧閫氭�婚噺 ")
+ private Long manuallyCalled = 0L;
+
+ @ApiModelProperty(value = "棣栨鏃犻渶闅忚")
+ private Long nonFollowUpFirst = 0L;
@ApiModelProperty(value = "棣栨搴旈殢璁�")
@Excel(name = " 棣栨搴旈殢璁� ")
@@ -118,8 +133,18 @@
@Excel(name = " 棣栨闅忚澶辫触 ")
private Long followUpFail = 0L;
+ @ApiModelProperty(value = "鍙婃椂闅忚浜烘锛堝凡瀹屾垚涓旀湭瓒呮椂锛宖inish_state=1锛�")
+ @Excel(name = " 鍙婃椂闅忚浜烘 ")
+ private Long timelyFollowUp = 0L;
+
+ @ApiModelProperty(value = "鍑洪櫌浜烘璇︽儏")
+ private List<ServiceSubtask> dischargeCountInfo;
+
@ApiModelProperty(value = "鏃犻渶闅忚璇︽儏")
private List<ServiceSubtask> nonFollowUpInfo;
+
+ @ApiModelProperty(value = "搴旈殢璁胯鎯�")
+ private List<ServiceSubtask> followUpNeededAllInfo;
@ApiModelProperty(value = "棣栨搴旈殢璁胯鎯�")
private List<ServiceSubtask> needFollowUpInfo;
@@ -132,6 +157,9 @@
@ApiModelProperty(value = "棣栨闅忚澶辫触璇︽儏")
private List<ServiceSubtask> followUpFailInfo;
+
+ @ApiModelProperty(value = "鍙婃椂闅忚璇︽儏")
+ private List<ServiceSubtask> timelyFollowUpInfo;
@ApiModelProperty(value = "棣栨闅忚浜哄伐璇︽儏")
private List<ServiceSubtask> manualInfo;
@@ -169,6 +197,24 @@
@ApiModelProperty(value = "鍐嶆闅忚寰俊璇︽儏")
private List<ServiceSubtask> wechatAgainInfo;
+ @ApiModelProperty(value = "1姝ｅ父璇煶璇︽儏")
+ private List<ServiceSubtask> taskSituation1Info;
+
+ @ApiModelProperty(value = "2鎮ｈ�呮嫆鎺ユ垨鎷掕璇︽儏")
+ private List<ServiceSubtask> taskSituation2Info;
+
+ @ApiModelProperty(value = "3闈㈣鎴栬�呮帴璇婅鎯�")
+ private List<ServiceSubtask> taskSituation3Info;
+
+ @ApiModelProperty(value = "4寰俊闅忚璇︽儏")
+ private List<ServiceSubtask> taskSituation4Info;
+
+ @ApiModelProperty(value = "5闅忚鐢佃瘽涓嶆纭鎯�")
+ private List<ServiceSubtask> taskSituation5Info;
+
+ @ApiModelProperty(value = "7鍏朵粬璇︽儏")
+ private List<ServiceSubtask> taskSituation6Info;
+
@ApiModelProperty(value = "鍙婃椂鐜�")
@Excel(name = " 鍙婃椂鐜� ")
private Double rate = 0.0;
@@ -197,6 +243,22 @@
@Excel(name = " 棣栨寰俊 ")
private Long weChat = 0L;
+ @ApiModelProperty(value = "棣栨浜哄伐鎴愬姛")
+ @Excel(name = " 棣栨浜哄伐鎴愬姛 ")
+ private Long manualSuccess = 0L;
+
+ @ApiModelProperty(value = "棣栨璇煶鎴愬姛")
+ @Excel(name = " 棣栨璇煶鎴愬姛 ")
+ private Long voiceSuccess = 0L;
+
+ @ApiModelProperty(value = "棣栨鐭俊鎴愬姛")
+ @Excel(name = " 棣栨鐭俊鎴愬姛 ")
+ private Long smsSuccess = 0L;
+
+ @ApiModelProperty(value = "棣栨寰俊鎴愬姛")
+ @Excel(name = " 棣栨寰俊鎴愬姛 ")
+ private Long weChatSuccess = 0L;
+
@ApiModelProperty(value = "缁撴灉寮傚父")
private Long abnormal = 0L;
@@ -204,9 +266,53 @@
@Excel(name = " 浜屾搴旈殢璁� ")
private Long needFollowUpAgain = 0L;
+ @ApiModelProperty(value = "浜屾鏃犻渶闅忚")
+ @Excel(name = " 浜屾鏃犻渶闅忚 ")
+ private Long nonFollowUpAgain = 0L;
+
@ApiModelProperty(value = "浜屾寰呴殢璁�")
@Excel(name = " 浜屾寰呴殢璁� ")
private Long pendingFollowUpAgain = 0L;
+
+ @ApiModelProperty(value = "棣栨闅忚浜哄伐鐢佃瘽瓒呮椂锛坰endstate=7 涓� isManuallyCalled=0锛�")
+ @Excel(name = " 棣栨闅忚浜哄伐鐢佃瘽瓒呮椂 ")
+ private Long manualCallTimeout = 0L;
+
+ @ApiModelProperty(value = "鍐嶆闅忚浜哄伐鐢佃瘽瓒呮椂锛坰endstate=7 涓� isManuallyCalled=0锛�")
+ @Excel(name = " 鍐嶆闅忚浜哄伐鐢佃瘽瓒呮椂 ")
+ private Long manualCallTimeoutAgain = 0L;
+
+ @ApiModelProperty(value = "棣栨寰呴殢璁垮叏閮紙sendstate in 1,2,3,7锛�")
+ @Excel(name = " 棣栨寰呴殢璁垮叏閮� ")
+ private Long pendingFollowUpAll = 0L;
+
+ @ApiModelProperty(value = "鍐嶆寰呴殢璁垮叏閮紙sendstate in 1,2,3,7锛�")
+ @Excel(name = " 鍐嶆寰呴殢璁垮叏閮� ")
+ private Long pendingFollowUpAllAgain = 0L;
+
+ @ApiModelProperty(value = "棣栨寰呴殢璁垮緟鍙戦�侊紙sendstate in 1,2锛�")
+ @Excel(name = " 棣栨寰呴殢璁垮緟鍙戦�� ")
+ private Long pendingFollowUpWaitSend = 0L;
+
+ @ApiModelProperty(value = "鍐嶆寰呴殢璁垮緟鍙戦�侊紙sendstate in 1,2锛�")
+ @Excel(name = " 鍐嶆寰呴殢璁垮緟鍙戦�� ")
+ private Long pendingFollowUpWaitSendAgain = 0L;
+
+ @ApiModelProperty(value = "棣栨寰呴殢璁垮凡鍙戦�侊紙sendstate in 3,7锛�")
+ @Excel(name = " 棣栨寰呴殢璁垮凡鍙戦�� ")
+ private Long pendingFollowUpSent = 0L;
+
+ @ApiModelProperty(value = "鍐嶆寰呴殢璁垮凡鍙戦�侊紙sendstate in 3,7锛�")
+ @Excel(name = " 鍐嶆寰呴殢璁垮凡鍙戦�� ")
+ private Long pendingFollowUpSentAgain = 0L;
+
+ @ApiModelProperty(value = "棣栨宸插彂閫侊紙sendstate=3锛�")
+ @Excel(name = " 棣栨宸插彂閫� ")
+ private Long sent = 0L;
+
+ @ApiModelProperty(value = "鍐嶆宸插彂閫侊紙sendstate=3锛�")
+ @Excel(name = " 鍐嶆宸插彂閫� ")
+ private Long sentAgain = 0L;
@ApiModelProperty(value = "浜屾闅忚鎴愬姛")
@Excel(name = " 浜屾闅忚鎴愬姛 ")
@@ -233,7 +339,24 @@
private Long smsAgain = 0L;
@ApiModelProperty(value = "浜屾寰俊")
+ @Excel(name = " 浜屾寰俊 ")
private Long weChatAgain = 0L;
+
+ @ApiModelProperty(value = "浜屾浜哄伐鎴愬姛")
+ @Excel(name = " 浜屾浜哄伐鎴愬姛 ")
+ private Long manualAgainSuccess = 0L;
+
+ @ApiModelProperty(value = "浜屾璇煶鎴愬姛")
+ @Excel(name = " 浜屾璇煶鎴愬姛 ")
+ private Long voiceAgainSuccess = 0L;
+
+ @ApiModelProperty(value = "浜屾鐭俊鎴愬姛")
+ @Excel(name = " 浜屾鐭俊鎴愬姛 ")
+ private Long smsAgainSuccess = 0L;
+
+ @ApiModelProperty(value = "浜屾寰俊鎴愬姛")
+ @Excel(name = " 浜屾寰俊鎴愬姛 ")
+ private Long weChatAgainSuccess = 0L;
@ApiModelProperty(value = "缁撴灉寮傚父")
private Long abnormalAgain = 0L;
@@ -242,6 +365,16 @@
@ApiModelProperty(value = "绉戝鐥呭尯")
private Integer statisticaltype;
+ @ApiModelProperty(value = "浠诲姟ID", required = true)
+ private Long taskId;
+
+ @Excel(name = "浠诲姟鍚嶇О")
+ @ApiModelProperty(value = "浠诲姟鍚嶇О")
+ private String taskName;
+
+ @ApiModelProperty(value = "鐤剧梾鐥呯")
+ private String diagType;
+
@ApiModelProperty(value = "鍖荤敓缂栫爜")
private String drcode;
--
Gitblit v1.9.3