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/ServiceTaskInfo.java | 19 ++++++++++++++++---
1 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/smartor/src/main/java/com/smartor/domain/ServiceTaskInfo.java b/smartor/src/main/java/com/smartor/domain/ServiceTaskInfo.java
index 96d0c7f..e7d1e34 100644
--- a/smartor/src/main/java/com/smartor/domain/ServiceTaskInfo.java
+++ b/smartor/src/main/java/com/smartor/domain/ServiceTaskInfo.java
@@ -33,7 +33,7 @@
private long taskstate;
@ApiModelProperty(value = "浠诲姟ID")
- private long taskguid;
+ private String taskguid;
@ApiModelProperty(value = "浠诲姟鍚嶇О")
private String taskname;
@@ -75,7 +75,7 @@
private String orgguid;
@ApiModelProperty(value = "鎮ｈ�匢D")
- private long patguid;
+ private String patguid;
@ApiModelProperty(value = "濮撳悕")
private String patname;
@@ -124,8 +124,21 @@
@ApiModelProperty(value = "绉戝")
private String deptname;
+ @ApiModelProperty(value = "绉戝CODE")
+ private String deptcode;
+
+ @ApiModelProperty(value = "鐥呭尯CODE")
+ private String districtcode;
+
+ @ApiModelProperty(value = "鐥呭尯鍚嶇О")
+ private String districtname;
+
@ApiModelProperty(value = "beizhu")
private String remark;
-
+ /**
+ * 鍒犻櫎鏍囪
+ */
+ @ApiModelProperty(value = "鍒犻櫎鏍囪")
+ private String delflag = "0";
}
--
Gitblit v1.9.3