From baed560033551773f244a1f16c81a4b5c9cca75c Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 09 五月 2025 10:09:42 +0800
Subject: [PATCH] 代码提交
---
smartor/src/main/java/com/smartor/domain/ServiceSubtaskVO.java | 72 +++++++++++++++++++++++++++++++++++-
1 files changed, 70 insertions(+), 2 deletions(-)
diff --git a/smartor/src/main/java/com/smartor/domain/ServiceSubtaskVO.java b/smartor/src/main/java/com/smartor/domain/ServiceSubtaskVO.java
index 4d095a9..e322a8c 100644
--- a/smartor/src/main/java/com/smartor/domain/ServiceSubtaskVO.java
+++ b/smartor/src/main/java/com/smartor/domain/ServiceSubtaskVO.java
@@ -28,6 +28,32 @@
@ApiModelProperty(value = "涓婚敭id")
private Long subId;
+
+ /**
+ * 绗笁鏂逛换鍔D
+ */
+ @ApiModelProperty(value = "绗笁鏂逛换鍔D")
+ private String taskGuid;
+
+ /**
+ * 闅忚娆℃暟
+ */
+ @ApiModelProperty(value = "闅忚娆℃暟")
+ private Integer visitCount;
+
+ /**
+ * 鏄惁鍦ㄦ闅忚锛�1鍚� 2鏄�
+ */
+ @ApiModelProperty(value = "鏄惁鍦ㄦ闅忚锛�1鏄� 2鍚�")
+ private Integer isVisitAgain;
+
+ /**
+ * 鎮ｈ�匢D
+ */
+ @Excel(name = " 鎮ｈ�匢D")
+ @ApiModelProperty(value = "鎮ｈ�匢D")
+ private String patguid;
+
/**
* 鍙戦�佷汉
*/
@@ -59,8 +85,8 @@
/**
* 鏈嶅姟绫诲瀷(1銆佺洃娴嬭瘎浼帮紱2銆佸嚭闄㈤殢璁匡紱3銆侀棬璇婇殢璁匡紱4銆佸鏁欏叧鎬�锛�5銆佸璇婇�氱煡锛�6銆佹弧鎰忓害璋冩煡锛�7銆佹偅鑰呮姤鍛婏紱 8銆佸叾浠栭�氱煡)
*/
- @Excel(name = "鏈嶅姟绫诲瀷(1銆佺洃娴嬭瘎浼帮紱2銆佸嚭闄㈤殢璁匡紱3銆侀棬璇婇殢璁匡紱4銆佸鏁欏叧鎬�锛�5銆佸璇婇�氱煡锛�6銆佹弧鎰忓害璋冩煡锛�7銆佹偅鑰呮姤鍛婏紱 8銆佸叾浠栭�氱煡)")
- @ApiModelProperty(value = "鏈嶅姟绫诲瀷(1銆佺洃娴嬭瘎浼帮紱2銆佸嚭闄㈤殢璁匡紱3銆侀棬璇婇殢璁匡紱4銆佸鏁欏叧鎬�锛�5銆佸璇婇�氱煡锛�6銆佹弧鎰忓害璋冩煡锛�7銆佹偅鑰呮姤鍛婏紱 8銆佸叾浠栭�氱煡)")
+ @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涓撶闅忚)")
private String serviceType;
/**
@@ -607,10 +633,52 @@
private Date startOutHospTime;
/**
+ * 寮�濮嬪彂閫佹棩鏈�
+ */
+ @ApiModelProperty(value = "寮�濮嬪彂閫佹棩鏈�")
+ private Date startSendDateTime;
+
+ /**
+ * 缁撴潫鍙戦�佹棩鏈�
+ */
+ @ApiModelProperty(value = "缁撴潫鍙戦�佹棩鏈�")
+ private Date endSendDateTime;
+
+ /**
* 缁撴潫鍑洪櫌鏃ユ湡
*/
@ApiModelProperty(value = "缁撴潫鍑洪櫌鏃ユ湡")
private Date endOutHospTime;
+ /**
+ * 绉戝涓庣梾鍖虹殑鏌ヨ鏄痮r杩樻槸and: 1:and(榛樿) 2:or
+ */
+ @ApiModelProperty(value = "绉戝涓庣梾鍖虹殑鏌ヨ鏄痮r杩樻槸and: 1:and(榛樿) 2:or ")
+ private String deptOrDistrict = "1";
+
+ /**
+ * 鍒涘缓寮�濮嬫椂闂�
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date createStartTime;
+
+ /**
+ * 鍒涘缓缁撴潫鏃堕棿
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date createEndTime;
+
+ /**
+ * 鎺掑簭锛堬級
+ */
+ @ApiModelProperty(value = "鎺掑簭锛�0 鍑洪櫌鏃堕棿(姝ｅ簭) 1 鍑洪櫌鏃堕棿(鍊掑簭) 2 鍙戦�佹椂闂�(姝ｅ簭) 3 鍙戦�佹椂闂�(鍊掑簭) ")
+ private Integer sort;
+
+
+ /**
+ * 鎮ｈ�呬笂娆￠殢璁跨殑subId
+ */
+ @ApiModelProperty(value = "鎮ｈ�呬笂娆￠殢璁跨殑subId")
+ private Integer upid;
}
--
Gitblit v1.9.3