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/SvyLibTemplateTargetoption.java | 23 ++++++++++++++++++++---
1 files changed, 20 insertions(+), 3 deletions(-)
diff --git a/smartor/src/main/java/com/smartor/domain/SvyLibTemplateTargetoption.java b/smartor/src/main/java/com/smartor/domain/SvyLibTemplateTargetoption.java
index 21f5c52..8a5031c 100644
--- a/smartor/src/main/java/com/smartor/domain/SvyLibTemplateTargetoption.java
+++ b/smartor/src/main/java/com/smartor/domain/SvyLibTemplateTargetoption.java
@@ -42,7 +42,7 @@
*/
@Excel(name = "鍒嗘暟")
@ApiModelProperty(value = "鍒嗘暟")
- private BigDecimal score;
+ private String score;
/**
* 鎸囨爣鍚嶇О
@@ -166,8 +166,8 @@
/**
* 鏄惁寮傚父鏍囪瘑
*/
- @Excel(name = "鏄惁寮傚父鏍囪瘑")
- @ApiModelProperty(value = "鏄惁寮傚父鏍囪瘑")
+ @Excel(name = "鏄惁寮傚父鏍囪瘑锛�0姝ｅ父 1寮傚父 2璀﹀憡")
+ @ApiModelProperty(value = "鏄惁寮傚父鏍囪瘑锛�0姝ｅ父 1寮傚父 2璀﹀憡")
private Long isabnormal;
// /**
@@ -266,4 +266,21 @@
@ApiModelProperty(value = "閫変腑鎻愮ず")
private String prompt;
+ /**
+ * 閫変腑璇ラ�夐」鍚庯紝闇�瑕佺粰褰撳墠鎮ｈ�呯珛鍗冲彂閫佺殑鏈嶅姟鐨刬d
+ */
+ @ApiModelProperty(value = "閫変腑璇ラ�夐」鍚庯紝闇�瑕佺粰褰撳墠鎮ｈ�呯珛鍗冲彂閫佺殑鏈嶅姟鐨刬d")
+ private Integer sendTaskid;
+
+ /**
+ * 鏈嶅姟鐨勫悕绉�
+ */
+ @ApiModelProperty(value = "鏈嶅姟鐨勫悕绉�")
+ private String sendTaskname;
+
+ /**
+ * 榛樿閫夐」锛�1 鍚︼紙榛樿锛� 2 鏄�
+ */
+ @ApiModelProperty("榛樿閫夐」锛�1 鍚︼紙榛樿锛� 2 鏄�")
+ private Long defaultValue;
}
--
Gitblit v1.9.3