From 2e952232f71eae1bf92590471fc7f5d20a1af873 Mon Sep 17 00:00:00 2001 From: liusheng <337615773@qq.com> Date: 星期四, 31 七月 2025 11:30:48 +0800 Subject: [PATCH] 代码提交 --- smartor/src/main/java/com/smartor/domain/ServiceSubtask.java | 26 ++++++++++++++++++++++++-- 1 files changed, 24 insertions(+), 2 deletions(-) diff --git a/smartor/src/main/java/com/smartor/domain/ServiceSubtask.java b/smartor/src/main/java/com/smartor/domain/ServiceSubtask.java index 97c62ff..9cda916 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; /** @@ -150,7 +152,7 @@ * 浠诲姟绫诲瀷(闂ㄨ瘖锛屼綇闄紝澶嶈瘖鈥�) */ @Excel(name = "浠诲姟绫诲瀷锛�1锛屾満鍣ㄤ汉璇煶锛堥殢璁匡級 2锛岄棶鍗凤紱3锛岄�氱煡锛堝鏁欙級") - @ApiModelProperty(value = "浠诲姟绫诲瀷锛�1锛屾満鍣ㄤ汉璇煶锛堥殢璁匡級 2锛岄棶鍗凤紱3锛岄�氱煡锛堝鏁欙級锛�)") + @ApiModelProperty(value = "浠诲姟绫诲瀷锛�1锛屾満鍣ㄤ汉璇煶锛堥殢璁匡級 2锛岄棶鍗凤紱3锛屽鏁欙紱 4.閫氱煡)") private String type; /** @@ -573,6 +575,12 @@ private Integer visitCount; /** + * 澶嶈瘖閫氱煡锛�0宸查�氱煡 1鏈�氱煡 + */ + @ApiModelProperty(value = "澶嶈瘖閫氱煡锛�0宸查�氱煡 1鏈�氱煡") + private Integer visitNotice; + + /** * 鏄惁鍦ㄦ闅忚锛�1鍚� 2鏄� */ @ApiModelProperty(value = "鏄惁鍦ㄦ闅忚锛�1鏄� 2鍚�") @@ -585,6 +593,7 @@ private Integer upid; @ApiModelProperty(value = "闅忚鏃堕棿") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date visitTime; /** @@ -592,7 +601,6 @@ */ @ApiModelProperty(value = "闅忚鏂瑰紡") private String visitType; - @ApiModelProperty(value = "闅忚閮ㄩ棬缂栫爜") @@ -603,4 +611,18 @@ @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