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/PatArchive.java | 75 ++++++++++++++++++++++++++++++++++++-
1 files changed, 72 insertions(+), 3 deletions(-)
diff --git a/smartor/src/main/java/com/smartor/domain/PatArchive.java b/smartor/src/main/java/com/smartor/domain/PatArchive.java
index fc0b617..1851fb2 100644
--- a/smartor/src/main/java/com/smartor/domain/PatArchive.java
+++ b/smartor/src/main/java/com/smartor/domain/PatArchive.java
@@ -64,11 +64,24 @@
private String notrequiredreason;
/**
+ * 涓嶈鏈嶅姟鐨勬搷浣滃尰鐢�
+ */
+ @ApiModelProperty("涓嶈鏈嶅姟鐨勬搷浣滃尰鐢�")
+ private String filterDrname;
+
+
+ /**
+ * 涓嶈鏈嶅姟鐨勬搷浣滃尰鐢�
+ */
+ @ApiModelProperty("涓嶈鏈嶅姟鐨勬搷浣滃尰鐢熺紪鐮�")
+ private String filterDrcode;
+
+ /**
* 鏉ユ簮(1锛欻IS锛�2锛氭暟鎹钩鍙帮紱3锛氭枃浠跺鍏ワ級
*/
@ApiModelProperty("鏉ユ簮(1锛欻IS锛�2锛氭暟鎹钩鍙帮紱3锛氭枃浠跺鍏ワ級")
@Excel(name = " 鏉ユ簮(1锛欻IS锛�2锛氭暟鎹钩鍙帮紱3锛氭枃浠跺鍏ワ級 ")
- private Integer sourcefrom;
+ private Long sourcefrom;
/**
* his绯荤粺鐨勬偅鑰卛d
@@ -191,6 +204,13 @@
@Excel(name = " 鎵嬫満鍙风爜 ")
private String telcode;
+ /**
+ * 鎵嬫満鐭彿
+ */
+ @ApiModelProperty("鎵嬫満鐭彿")
+ @Excel(name = " 鎵嬫満鐭彿 ")
+ private String telshortcode;
+
/**
* 浜插睘鍙风爜
@@ -212,6 +232,13 @@
@ApiModelProperty("鏈烘瀯ID")
@Excel(name = " 鏈烘瀯ID ")
private String orgid;
+
+ /**
+ * 鏈烘瀯ID
+ */
+ @ApiModelProperty("闄㈠尯")
+ @Excel(name = " 闄㈠尯 ")
+ private String campusid;
/**
* 寰俊openid
@@ -309,8 +336,8 @@
/**
* 浼氬憳灞炴��:0闈炰細鍛橈紝1涓�鑸細鍛樸��2閲嶈浼氬憳
*/
- @ApiModelProperty("浼氬憳灞炴��:0闈炰細鍛橈紝1涓�鑸細鍛樸��2閲嶈浼氬憳")
- @Excel(name = " 浼氬憳灞炴��:0闈炰細鍛橈紝1涓�鑸細鍛樸��2閲嶈浼氬憳 ")
+ @ApiModelProperty("浼氬憳灞炴��:0闈炰細鍛橈紝1涓�鑸細鍛樸��2閲嶈浼氬憳 -1铏氭嫙鎮ｈ��")
+ @Excel(name = " 浼氬憳灞炴��:0闈炰細鍛橈紝1涓�鑸細鍛樸��2閲嶈浼氬憳 -1铏氭嫙鎮ｈ��")
private String viptype;
@ApiModelProperty("鍑洪櫌鐥呭尯鍚嶇О")
@@ -380,4 +407,46 @@
@Excel(name = " 绗簩骞撮緞鍗曚綅 ")
private String ageUnit2;
+ /**
+ * pageNum
+ */
+ @ApiModelProperty("pageNum")
+ private Integer pageNum;
+
+ /**
+ * pageSize
+ */
+ @ApiModelProperty("pageSize")
+ private Integer pageSize;
+ /**
+ * pageNum
+ */
+ @ApiModelProperty("pn")
+ private Integer pn;
+
+ /**
+ * pageSize
+ */
+ @ApiModelProperty("ps")
+ private Integer ps;
+
+ @ApiModelProperty(value = "鏈�鍚庡紑濮嬫椂闂�")
+ private String lastStartTime;
+
+ @ApiModelProperty(value = "鏈�鍚庣粨鏉熸椂闂�")
+ private String lastEndTime;
+
+ /**
+ * 鍒涘缓鏃堕棿
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date createTimeStart;
+
+ /**
+ * 鍒涘缓鏃堕棿
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date createTimeEnd;
+
+
}
--
Gitblit v1.9.3