From 37d8d7dbbcd259e281f6279938ab6491f41e057c Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期三, 18 三月 2026 17:51:29 +0800
Subject: [PATCH] 【丽水】获取当前用户随访数量统计 补充
---
smartor/src/main/java/com/smartor/domain/ServiceSubtask.java | 55 +++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 43 insertions(+), 12 deletions(-)
diff --git a/smartor/src/main/java/com/smartor/domain/ServiceSubtask.java b/smartor/src/main/java/com/smartor/domain/ServiceSubtask.java
index 69c18ee..02ad337 100644
--- a/smartor/src/main/java/com/smartor/domain/ServiceSubtask.java
+++ b/smartor/src/main/java/com/smartor/domain/ServiceSubtask.java
@@ -68,8 +68,8 @@
/**
* 寮傚父鏍囪瘑
*/
- @ApiModelProperty(value = "寮傚父鏍囪瘑")
- @Excel(name = " 寮傚父鏍囪瘑 ")
+ @ApiModelProperty(value = "寮傚父鏍囪瘑锛�0缁胯壊锛�1绾㈣壊锛�2榛勮壊")
+ @Excel(name = " 寮傚父鏍囪瘑:0缁胯壊锛�1绾㈣壊锛�2榛勮壊 ")
private String excep;
/**
@@ -158,8 +158,8 @@
/**
* 鏈嶅姟绫诲瀷(1銆佺洃娴嬭瘎浼帮紱2銆佸嚭闄㈤殢璁匡紱3銆侀棬璇婇殢璁匡紱4銆佸鏁欏叧鎬�锛�5銆佸璇婄鐞嗭紱6銆佹弧鎰忓害璋冩煡锛�7銆佹偅鑰呮姤鍛婏紱 8銆佸叾浠栭�氱煡 9浣撴闅忚 10.鍖绘妧闅忚 11锛屽奖鍍忎笓绉戦殢璁� 12銆佸績鐢典笓绉戦殢璁匡紝 13涓撶闅忚)
*/
- @Excel(name = "鏈嶅姟绫诲瀷(1銆佺洃娴嬭瘎浼帮紱2銆佸嚭闄㈤殢璁匡紱3銆侀棬璇婇殢璁匡紱4銆佸鏁欏叧鎬�锛�5銆佸璇婄鐞嗭紱6銆佹弧鎰忓害璋冩煡锛�7銆佹偅鑰呮姤鍛婏紱 8銆佸叾浠栭�氱煡 9浣撴闅忚 10.鍖绘妧闅忚 11锛屽奖鍍忎笓绉戦殢璁� 12銆佸績鐢典笓绉戦殢璁匡紝 13涓撶闅忚)")
- @ApiModelProperty(value = "鏈嶅姟绫诲瀷(1銆佺洃娴嬭瘎浼帮紱2銆佸嚭闄㈤殢璁匡紱3銆侀棬璇婇殢璁匡紱4銆佸鏁欏叧鎬�锛�5銆佸璇婄鐞嗭紱6銆佹弧鎰忓害璋冩煡锛�7銆佹偅鑰呮姤鍛婏紱 8銆佸叾浠栭�氱煡 9浣撴闅忚 10.鍖绘妧闅忚 11锛屽奖鍍忎笓绉戦殢璁� 12銆佸績鐢典笓绉戦殢璁匡紝 13涓撶闅忚")
+ @Excel(name = "鏈嶅姟绫诲瀷(1銆佺洃娴嬭瘎浼帮紱2銆佸嚭闄㈤殢璁匡紱3銆侀棬璇婇殢璁匡紱4銆佸鏁欏叧鎬�锛�5銆佸璇婄鐞嗭紱6銆佷綇闄㈡弧鎰忓害璋冩煡锛�7銆佹偅鑰呮姤鍛婏紱 8銆佸叾浠栭�氱煡 9浣撴闅忚 10.鍖绘妧闅忚 11锛屽奖鍍忎笓绉戦殢璁� 12銆佸績鐢典笓绉戦殢璁匡紝 13涓撶闅忚 14銆侀棬璇婃弧鎰忓害璋冩煡 15鎶曡瘔寤鸿 16璇鹃闅忚")
+ @ApiModelProperty(value = "鏈嶅姟绫诲瀷(1銆佺洃娴嬭瘎浼帮紱2銆佸嚭闄㈤殢璁匡紱3銆侀棬璇婇殢璁匡紱4銆佸鏁欏叧鎬�锛�5銆佸璇婄鐞嗭紱6銆佷綇闄㈡弧鎰忓害璋冩煡锛�7銆佹偅鑰呮姤鍛婏紱 8銆佸叾浠栭�氱煡 9浣撴闅忚 10.鍖绘妧闅忚 11锛屽奖鍍忎笓绉戦殢璁� 12銆佸績鐢典笓绉戦殢璁匡紝 13涓撶闅忚 14銆侀棬璇婃弧鎰忓害璋冩煡 15鎶曡瘔寤鸿 16璇鹃闅忚")
private String serviceType;
/**
@@ -190,6 +190,14 @@
@Excel(name = " 鍙戦�佹棩鏈� ", width = 30, dateFormat = "yyyy-MM-dd")
@ApiModelProperty(value = "鍙戦�佹棩鏈�")
private Date senddate;
+
+ /**
+ * 鏂扮殑鍒涘缓鏃堕棿锛堢敤鏉ュ仛鏌ヨ鍙傛暟鐢級
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @Excel(name = " 鍙戦�佹棩鏈� ", width = 30, dateFormat = "yyyy-MM-dd")
+ @ApiModelProperty(value = "鏂扮殑鍒涘缓鏃堕棿")
+ private Date createTimeNew;
/**
* 涓婂崍寮�濮嬪彂閫佹椂闂撮檺鍒�
@@ -361,6 +369,13 @@
private String preachform;
/**
+ * 褰撳墠鍙戦�佹柟寮�
+ */
+ @Excel(name = " 褰撳墠鍙戦�佹柟寮�")
+ @ApiModelProperty("褰撳墠鍙戦�佹柟寮�")
+ private String currentPreachform;
+
+ /**
* 搴婂彿
*/
@Excel(name = "搴婂彿")
@@ -511,7 +526,7 @@
/**
- * 闀挎湡浠诲姟锛岀粰鎮ｈ�呭彂閫佺殑鏃堕棿
+ * 闀挎湡浠诲姟锛岀粰鎮ｈ�呭彂閫佺殑鏃堕棿 寮冪敤
*/
@Excel(name = " 闀挎湡浠诲姟锛岀粰鎮ｈ�呭彂閫佺殑鏃堕棿")
@ApiModelProperty(value = "闀挎湡浠诲姟锛岀粰鎮ｈ�呭彂閫佺殑鏃堕棿")
@@ -626,16 +641,32 @@
@ApiModelProperty(value = "ps")
private Integer ps;
-
- /**
- * 鎮ｈ�呮潵婧�
- */
@ApiModelProperty(value = "缁忕鍖荤敓缂栫爜")
private String managementDoctorCode;
- /**
- * 鎮ｈ�呮潵婧�
- */
@ApiModelProperty(value = "缁忕鍖荤敓")
private String managementDoctor;
+
+ @ApiModelProperty(value = "闅忚鎯呭喌:1姝ｅ父璇煶,2鎮ｈ�呮嫆鎺ユ垨鎷掕,3闈㈣鎴栬�呮帴璇�,4寰俊闅忚,5闅忚鐢佃瘽涓嶆纭�,6琚繃婊�,7鍏跺畠")
+ private Integer taskSituation;
+
+ @ApiModelProperty(value = "寮傚父棰勮锛�0缁胯壊锛�1绾㈣壊锛�2榛勮壊; 3宸插鐞�")
+ private Integer isabnormal;
+
+ @ApiModelProperty(value = "缁х画鏍囪瘑")
+ private Integer continueFlag;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty(value = "缁х画鏃堕棿鐜板湪")
+ private Date continueTimeNow;
+
+ @ApiModelProperty(value = "缁х画鍐呭")
+ private String continueContent;
+
+ @ApiModelProperty(value = "缁х画娆℃暟")
+ private Integer continueCount;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty(value = "缁х画鏃堕棿涓嬫")
+ private Date continueTimeNext;
}
--
Gitblit v1.9.3