From 1e1814178edf84090b28492bbad340ab13e5c169 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期二, 22 七月 2025 18:16:34 +0800
Subject: [PATCH] 代码提交
---
smartor/src/main/java/com/smartor/domain/ServiceSubtask.java | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 50 insertions(+), 4 deletions(-)
diff --git a/smartor/src/main/java/com/smartor/domain/ServiceSubtask.java b/smartor/src/main/java/com/smartor/domain/ServiceSubtask.java
index bea3924..f21c3af 100644
--- a/smartor/src/main/java/com/smartor/domain/ServiceSubtask.java
+++ b/smartor/src/main/java/com/smartor/domain/ServiceSubtask.java
@@ -76,12 +76,14 @@
* 鍑洪櫌鏃堕棿
*/
@ApiModelProperty(value = "鍑洪櫌鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date endtime;
/**
* 鍏ラ櫌鏃堕棿
*/
@ApiModelProperty(value = "鍏ラ櫌鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date starttime;
/**
@@ -234,28 +236,28 @@
/**
* 鍙戦�佺姸鎬�
*/
- @Excel(name = " 鍙戦�佺姸鎬� 1 琚鍙�(鍦ㄤ换鍔′腑鏄柊寤猴紝鍦ㄦ湇鍔′腑鏄棰嗗彇) 2 寰呭彂閫� 3 宸插彂閫� 4 涓嶆墽琛� 5 鍙戦�佸け璐� 6 宸插畬鎴怽") ")
+// @Excel(name = " 鍙戦�佺姸鎬� 1 琚鍙�(鍦ㄤ换鍔′腑鏄柊寤猴紝鍦ㄦ湇鍔′腑鏄棰嗗彇) 2 寰呭彂閫� 3 宸插彂閫� 4 涓嶆墽琛� 5 鍙戦�佸け璐� 6 宸插畬鎴怽") ")
@ApiModelProperty(value = "鍙戦�佺姸鎬� 1 琚鍙�(鍦ㄤ换鍔′腑鏄柊寤猴紝鍦ㄦ湇鍔′腑鏄棰嗗彇) 2 寰呭彂閫� 3 宸插彂閫� 4 涓嶆墽琛� 5 鍙戦�佸け璐� 6 宸插畬鎴�")
private Long sendstate;
/**
* 鏆傚仠鐘� 锛� 鐘舵�佸鏋滃彂鐢熶慨鏀癸紝鍊煎氨鍔�1
*/
- @Excel(name = " 鏆傚仠鐘� 锛� 鐘舵�佸鏋滃彂鐢熶慨鏀癸紝鍊煎氨鍔�1 ")
+// @Excel(name = " 鏆傚仠鐘� 锛� 鐘舵�佸鏋滃彂鐢熶慨鏀癸紝鍊煎氨鍔�1 ")
@ApiModelProperty(value = "鏆傚仠鐘� 锛� 鐘舵�佸鏋滃彂鐢熶慨鏀癸紝鍊煎氨鍔�1")
private Long stopState;
/**
* 鍙戦�乁UID
*/
- @Excel(name = " 鍙戦�乁UID ")
+// @Excel(name = " 鍙戦�乁UID ")
@ApiModelProperty(value = "鍙戦�乁UID")
private String senduuid;
/**
* 缁撴灉
*/
- @Excel(name = " 缁撴灉 ")
+// @Excel(name = " 缁撴灉 ")
@ApiModelProperty(value = "缁撴灉")
private String result;
@@ -573,10 +575,54 @@
private Integer visitCount;
/**
+ * 澶嶈瘖閫氱煡锛�0宸查�氱煡 1鏈�氱煡
+ */
+ @ApiModelProperty(value = "澶嶈瘖閫氱煡锛�0宸查�氱煡 1鏈�氱煡")
+ private Integer visitNotice;
+
+ /**
* 鏄惁鍦ㄦ闅忚锛�1鍚� 2鏄�
*/
@ApiModelProperty(value = "鏄惁鍦ㄦ闅忚锛�1鏄� 2鍚�")
private Integer isVisitAgain;
+ /**
+ * 鎮ｈ�呬笂娆￠殢璁跨殑subId
+ */
+ @ApiModelProperty(value = "鎮ｈ�呬笂娆￠殢璁跨殑subId")
+ private Integer upid;
+ @ApiModelProperty(value = "闅忚鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date visitTime;
+
+ /**
+ * 闅忚鏂瑰紡
+ */
+ @ApiModelProperty(value = "闅忚鏂瑰紡")
+ private String visitType;
+
+
+ @ApiModelProperty(value = "闅忚閮ㄩ棬缂栫爜")
+ private String visitDeptCode;
+
+ @ApiModelProperty(value = "闅忚閮ㄩ棬鍚嶇О")
+ private String visitDeptName;
+
+ @ApiModelProperty(value = "闅忚閮ㄩ棬缂栫爜闆嗗悎")
+ private List<String> visitDeptCodes;
+
+ /**
+ * pageNum
+ */
+ @Excel(name = "pn")
+ @ApiModelProperty(value = "pn")
+ private Integer pn;
+
+ /**
+ * pageSize
+ */
+ @Excel(name = "ps")
+ @ApiModelProperty(value = "ps")
+ private Integer ps;
}
--
Gitblit v1.9.3