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/IvrTaskTemplateScriptVO.java | 81 ++++++++++++++++++++++++++++++++++------
1 files changed, 69 insertions(+), 12 deletions(-)
diff --git a/smartor/src/main/java/com/smartor/domain/IvrTaskTemplateScriptVO.java b/smartor/src/main/java/com/smartor/domain/IvrTaskTemplateScriptVO.java
index b47a625..b8d2389 100644
--- a/smartor/src/main/java/com/smartor/domain/IvrTaskTemplateScriptVO.java
+++ b/smartor/src/main/java/com/smartor/domain/IvrTaskTemplateScriptVO.java
@@ -31,11 +31,22 @@
private Long id;
/**
+ * 闂埜棰樼洰鍒嗙被ID闆嗗悎
+ */
+ @ApiModelProperty("闂缁村害")
+ private String dimension;
+
+ /**
+ * 闂埜棰樼洰鍒嗙被ID闆嗗悎
+ */
+ @ApiModelProperty("婊℃剰搴︽剰瑙佸紓甯革紙鍙拡瀵规枃鏈級")
+ private String isMydException;
+ /**
* 鍒嗘暟
*/
@Excel(name = "鍒嗘暟")
@ApiModelProperty(value = "鍒嗘暟")
- private BigDecimal score;
+ private String score;
/**
* 浠诲姟id
@@ -173,18 +184,18 @@
private String groupName;
/**
- * 绫诲埆鍚�
+ * 璇煶闂绫诲埆鍚嶇О锛堝搴旂殑鏄痠vr_liba_script_ssort锛�
*/
- @Excel(name = "绫诲埆鍚�")
- @ApiModelProperty(value = "绫诲埆鍚�")
- private String categoryName;
+ @Excel(name = "璇煶闂绫诲埆鍚嶇О锛堝搴旂殑鏄痠vr_liba_script_ssort锛�")
+ @ApiModelProperty(value = "璇煶闂绫诲埆鍚嶇О锛堝搴旂殑鏄痠vr_liba_script_ssort锛�")
+ private String scriptAssortname;
/**
- * 绫诲埆ID
+ * 璇煶闂绫诲埆ID锛堝搴旂殑鏄痠vr_liba_script_ssort锛�
*/
- @Excel(name = "绫诲埆ID")
- @ApiModelProperty(value = "绫诲埆ID")
- private Long assortid;
+ @Excel(name = "璇煶闂绫诲埆ID锛堝搴旂殑鏄痠vr_liba_script_ssort锛�")
+ @ApiModelProperty(value = "璇煶闂绫诲埆ID锛堝搴旂殑鏄痠vr_liba_script_ssort锛�")
+ private Long scriptAssortid;
/**
* 鎸囨爣閫夐」
*/
@@ -309,7 +320,7 @@
*/
@Excel(name = "鏄惁蹇呭～,1:蹇呭～ 2锛氬彲浠ヤ笉濉� ", readConverterExp = "缁�=浜哄伐鐢ㄧ殑锛孉I涓嶇敤閬靛畧")
@ApiModelProperty(value = "鏄惁蹇呭～,1:蹇呭～ 2锛氬彲浠ヤ笉濉� 锛堢粰浜哄伐鐢ㄧ殑锛孉I涓嶇敤閬靛畧锛�")
- private String isMust;
+ private String ismandatory;
/**
* 闂缁撴灉锛堢粰鈥滃�肩被鍨嬧�濇槸鏂囨湰鎴栬�呮暟鍊肩敤鐨勶級
@@ -341,13 +352,59 @@
private Integer sort;
/**
- * 寮傚父棰勮锛�0缁胯壊锛�1绾㈣壊锛�2榛勮壊
+ * 寮傚父棰勮锛�0缁胯壊锛� 1绾㈣壊 2榛勮壊锛�
*/
- @ApiModelProperty(value = "寮傚父棰勮锛�0缁胯壊锛�1绾㈣壊锛�2榛勮壊")
+ @ApiModelProperty(value = "寮傚父棰勮锛�0缁胯壊锛� 1绾㈣壊 2榛勮壊锛�")
private Long isabnormal;
private List<Integer> sendTaskids;
+ @Excel(name = "璐ｄ换绉戝鍚嶇О锛堝鏋滃涓瀹ょ敤閫楀彿鍒嗗壊锛�")
+ @ApiModelProperty(value = "璐ｄ换绉戝鍚嶇О锛堝鏋滃涓瀹ょ敤閫楀彿鍒嗗壊锛�")
+ private String dutyDeptName;
+
+ @Excel(name = "璐ｄ换绉戝缂栫爜锛堝鏋滃涓瀹ょ敤閫楀彿鍒嗗壊锛�")
+ @ApiModelProperty(value = "璐ｄ换绉戝缂栫爜锛堝鏋滃涓瀹ょ敤閫楀彿鍒嗗壊锛�")
+ private String dutyDeptCode;
+
+ @Excel(name = "鎶ュ绉戝鍚嶇О锛堝鏋滃涓瀹ょ敤閫楀彿鍒嗗壊锛�")
+ @ApiModelProperty(value = "鎶ュ绉戝鍚嶇О锛堝鏋滃涓瀹ょ敤閫楀彿鍒嗗壊锛�")
+ private String reportDeptName;
+
+ @Excel(name = "鎶ュ绉戝缂栫爜锛堝鏋滃涓瀹ょ敤閫楀彿鍒嗗壊锛�")
+ @ApiModelProperty(value = "鎶ュ绉戝缂栫爜锛堝鏋滃涓瀹ょ敤閫楀彿鍒嗗壊锛�")
+ private String reportDeptCode;
+
+ @Excel(name = "璐ｄ换绉戝璐ｄ换浜哄悕绉帮紙濡傛灉澶氫釜绉戝鐢ㄩ�楀彿鍒嗗壊锛�")
+ @ApiModelProperty(value = "璐ｄ换绉戝璐ｄ换浜哄悕绉帮紙濡傛灉澶氫釜绉戝鐢ㄩ�楀彿鍒嗗壊锛�")
+ private String dutyDeptPersonName;
+
+ @Excel(name = "璐ｄ换绉戝璐ｄ换浜虹紪鐮侊紙濡傛灉澶氫釜绉戝鐢ㄩ�楀彿鍒嗗壊锛�")
+ @ApiModelProperty(value = "璐ｄ换绉戝璐ｄ换浜虹紪鐮侊紙濡傛灉澶氫釜绉戝鐢ㄩ�楀彿鍒嗗壊锛�")
+ private String dutyDeptPersonCode;
+
+ @Excel(name = "鎶ュ绉戝璐ｄ换浜哄悕绉帮紙濡傛灉澶氫釜绉戝鐢ㄩ�楀彿鍒嗗壊锛�")
+ @ApiModelProperty(value = "鎶ュ绉戝鍚嶇О锛堝鏋滃涓瀹ょ敤閫楀彿鍒嗗壊锛�")
+ private String reportDeptPersonName;
+
+ @Excel(name = "鎶ュ绉戝缂栫爜锛堝鏋滃涓瀹ょ敤閫楀彿鍒嗗壊锛�")
+ @ApiModelProperty(value = "鎶ュ绉戝璐ｄ换浜虹紪鐮侊紙濡傛灉澶氫釜绉戝鐢ㄩ�楀彿鍒嗗壊锛�")
+ private String reportDeptPersonCode;
+
+ /**
+ * 娴佽浆绉戝璐ｄ换浜虹紪鐮� (濡傛灉澶氫釜绉戝鐢ㄩ�楀彿鍒嗗壊)
+ */
+ @Excel(name = "娴佽浆绉戝璐ｄ换浜虹紪鐮侊紙濡傛灉澶氫釜绉戝鐢ㄩ�楀彿鍒嗗壊锛�")
+ @ApiModelProperty(value = "娴佽浆绉戝璐ｄ换浜虹紪鐮侊紙濡傛灉澶氫釜绉戝鐢ㄩ�楀彿鍒嗗壊锛�")
+ private String circulationDeptPersonCode;
+
+ /**
+ * 娴佽浆绉戝璐ｄ换浜哄悕绉� (濡傛灉澶氫釜绉戝鐢ㄩ�楀彿鍒嗗壊)
+ */
+ @Excel(name = "娴佽浆绉戝璐ｄ换浜哄悕绉帮紙濡傛灉澶氫釜绉戝鐢ㄩ�楀彿鍒嗗壊锛�")
+ @ApiModelProperty(value = "娴佽浆绉戝璐ｄ换浜哄悕绉帮紙濡傛灉澶氫釜绉戝鐢ㄩ�楀彿鍒嗗壊锛�")
+ private String circulationDeptPersonName;
+
/**
* 璇濇湳閫夐」
*/
--
Gitblit v1.9.3