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/ServiceSubtaskDiagname.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/smartor/src/main/java/com/smartor/domain/ServiceSubtaskDiagname.java b/smartor/src/main/java/com/smartor/domain/ServiceSubtaskDiagname.java
index 867f79e..e679078 100644
--- a/smartor/src/main/java/com/smartor/domain/ServiceSubtaskDiagname.java
+++ b/smartor/src/main/java/com/smartor/domain/ServiceSubtaskDiagname.java
@@ -44,19 +44,19 @@
@ApiModelProperty(value = "闅忚浜哄憳")
private String operator;
- @Excel(name = "闅忚瀹屾垚鏃ユ湡")
+ @Excel(name = "闅忚瀹屾垚鏃ユ湡",dateFormat = "yyyy-MM-dd")
@ApiModelProperty(value = "闅忚瀹屾垚鏃ユ湡")
private Date finishtime;
- @Excel(name = "搴旈殢璁挎棩鏈�")
+ @Excel(name = "搴旈殢璁挎棩鏈�",dateFormat = "yyyy-MM-dd")
@ApiModelProperty(value = "搴旈殢璁挎棩鏈�")
- private Date longSendTime;
+ private Date visitTime;
- @Excel(name = "鍑洪櫌鏃ユ湡")
+ @Excel(name = "鍑洪櫌鏃ユ湡",dateFormat = "yyyy-MM-dd")
@ApiModelProperty(value = "鍑洪櫌鏃ユ湡")
private Date endtime;
- @Excel(name = "鍑洪櫌澶╂暟")
+ @Excel(name = "鍑洪櫌澶╂暟", suffix = "澶�")
@ApiModelProperty(value = "鍑洪櫌澶╂暟")
private Integer endDay;
--
Gitblit v1.9.3