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/VisitPlan.java | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/smartor/src/main/java/com/smartor/domain/VisitPlan.java b/smartor/src/main/java/com/smartor/domain/VisitPlan.java
index 92ac27a..835201d 100644
--- a/smartor/src/main/java/com/smartor/domain/VisitPlan.java
+++ b/smartor/src/main/java/com/smartor/domain/VisitPlan.java
@@ -29,53 +29,53 @@
/** 鍑洪櫌鏃ユ湡 */
@ApiModelProperty("鍑洪櫌鏃ユ湡")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @Excel(name = "鍑洪櫌鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "鍑洪櫌鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date outHospDate;
/** 璁″垝闅忚鏃ユ湡 */
@ApiModelProperty("璁″垝闅忚鏃ユ湡")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @Excel(name = "璁″垝闅忚鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "璁″垝闅忚鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date planVisitDate;
/** 璇煶鍩虹妯℃澘ID锛堝晢璁殑鍥哄畾妯℃澘鏀捐繖涓〃閲岋級 */
@ApiModelProperty("璇煶鍩虹妯℃澘ID锛堝晢璁殑鍥哄畾妯℃澘鏀捐繖涓〃閲岋級")
- @Excel(name = "璇煶鍩虹妯℃澘ID", readConverterExp = "鍟�=璁殑鍥哄畾妯℃澘鏀捐繖涓〃閲�")
+ @Excel(name = "璇煶鍩虹妯℃澘ID", readConverterExp = "鍟�=璁殑鍥哄畾妯℃澘鏀捐繖涓〃閲�")
private Long ivrLibaTemplateId;
/** 鎮ｈ�匢D */
@ApiModelProperty("鎮ｈ�匢D")
- @Excel(name = "鎮ｈ�匢D")
+ @Excel(name = "鎮ｈ�匢D")
private Long patid;
/** 鎮ｈ�呮墜鏈哄彿 */
@ApiModelProperty("鎮ｈ�呮墜鏈哄彿")
- @Excel(name = "鎮ｈ�呮墜鏈哄彿")
+ @Excel(name = "鎮ｈ�呮墜鏈哄彿")
private String phone;
/** service_task涓婚敭 */
@ApiModelProperty("service_task涓婚敭")
- @Excel(name = "service_task涓婚敭")
+ @Excel(name = "service_task涓婚敭")
private Long taskId;
/** 瀛愪换鍔D */
@ApiModelProperty("瀛愪换鍔D")
- @Excel(name = "瀛愪换鍔D")
+ @Excel(name = "瀛愪换鍔D")
private Long subTaskId;
/** 浠诲姟妯℃澘ID */
@ApiModelProperty("浠诲姟妯℃澘ID")
- @Excel(name = "浠诲姟妯℃澘ID")
+ @Excel(name = "浠诲姟妯℃澘ID")
private Long taskTemplateId;
/** 0 鏈墽琛� 1宸叉墽琛� */
@ApiModelProperty("0 鏈墽琛� 1宸叉墽琛�")
- @Excel(name = "0 鏈墽琛� 1宸叉墽琛�")
+ @Excel(name = "0 鏈墽琛� 1宸叉墽琛�")
private Long isExecute;
/** 鍏紬鍙稩D */
@ApiModelProperty("鍏紬鍙稩D")
- @Excel(name = "鍏紬鍙稩D")
+ @Excel(name = "鍏紬鍙稩D")
private String openid;
}
--
Gitblit v1.9.3