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/VO/HeLibraryCountVO.java | 19 +++++++++++++++++--
1 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/smartor/src/main/java/com/smartor/domain/VO/HeLibraryCountVO.java b/smartor/src/main/java/com/smartor/domain/VO/HeLibraryCountVO.java
index c398c38..824633e 100644
--- a/smartor/src/main/java/com/smartor/domain/VO/HeLibraryCountVO.java
+++ b/smartor/src/main/java/com/smartor/domain/VO/HeLibraryCountVO.java
@@ -41,11 +41,26 @@
@ApiModelProperty(value = "鏈烘瀯ID")
private String orgid;
- @ApiModelProperty("鍙戦�佺姸鎬�")
- private String sendstate;
+ @ApiModelProperty(value = "闄㈠尯缂栫爜")
+ private String campusid;
+
+ /**
+ * 鍙戦�佺姸鎬�
+ */
+ @Excel(name = " 鍙戦�佺姸鎬� ")
+ @ApiModelProperty(value = "鍙戦�佺姸鎬� 1 琚鍙�(鍦ㄤ换鍔′腑鏄柊寤猴紝鍦ㄦ湇鍔′腑鏄棰嗗彇) 2 寰呭彂閫� 3 宸插彂閫� 4 涓嶆墽琛� 5 鍙戦�佸け璐� 6 宸插畬鎴� 7 瓒呮椂(浜哄伐)")
+ private Long sendstate;
@ApiModelProperty("瀹屾垚鐘舵�侊紙0鏈畬鎴� 1宸插畬鎴� 瀵瑰簲finishtime鏄惁鏈夊�硷級")
private String isFinished;
+ /**
+ * 瓒呴摼鎺ョ粺璁″垪琛ㄧ被鍨� - 瀹ｆ暀瓒呴摼鎺ョ粺璁�
+ * totalCountInfo - 瀹ｆ暀鍙戦�佹�婚噺
+ * sendSuccessCountInfo - 鍙戦�佹垚鍔熼噺 sendstate = 6
+ * readCountInfo - 宸茶閲� finishtime 锛�= null
+ */
+ @ApiModelProperty("瓒呴摼鎺ョ粺璁″垪琛ㄧ被鍨�")
+ private String hyperLinkInfoType;
/**
* pageNum
--
Gitblit v1.9.3