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/SvyLibScriptCategoryVO.java | 20 ++++++++++++++------
1 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/smartor/src/main/java/com/smartor/domain/SvyLibScriptCategoryVO.java b/smartor/src/main/java/com/smartor/domain/SvyLibScriptCategoryVO.java
index 8bccb60..b0c5792 100644
--- a/smartor/src/main/java/com/smartor/domain/SvyLibScriptCategoryVO.java
+++ b/smartor/src/main/java/com/smartor/domain/SvyLibScriptCategoryVO.java
@@ -41,6 +41,20 @@
@ApiModelProperty("闂嵎棰樼洰id")
private Long topicid;
+
+ /**
+ * 闂绫诲瀷锛堜緥濡�,闂ㄨ瘖婊℃剰搴︼細mzmyd 浣忛櫌婊℃剰搴︼細zymyd ...锛�
+ */
+ @Excel(name = "闂绫诲瀷锛堜緥濡�,闂ㄨ瘖婊℃剰搴︼細mzmyd 浣忛櫌婊℃剰搴︼細zymyd ...锛�")
+ @ApiModelProperty("闂绫诲瀷锛堜緥濡�,闂ㄨ瘖婊℃剰搴︼細mzmyd 浣忛櫌婊℃剰搴︼細zymyd ...锛�")
+ private String type;
+
+ /**
+ * 瀛愬璞�
+ */
+ @ApiModelProperty("瀛愬璞￠泦")
+ private List<SvyLibScriptCategory> svyLibScriptCategoryList = new ArrayList<>();
+
/**
* 鐖禝D
*/
@@ -67,11 +81,5 @@
@Excel(name = "鍖婚櫌鏈烘瀯id")
@ApiModelProperty("鍖婚櫌鏈烘瀯id")
private String orgid;
-
- /**
- * 瀛愬璞�
- */
- @ApiModelProperty("瀛愬璞￠泦")
- private List<SvyLibScriptCategory> svyLibScriptCategoryList = new ArrayList<>();
}
--
Gitblit v1.9.3