From 732024c03df1d810b8f5a8a526066967f1bfbb5d Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 26 六月 2026 17:53:27 +0800
Subject: [PATCH] 南华部分功能提交
---
smartor/src/main/java/com/smartor/domain/ServiceSubtaskExport.java | 80 ++++++++++++++++++++++++----------------
1 files changed, 48 insertions(+), 32 deletions(-)
diff --git a/smartor/src/main/java/com/smartor/domain/ServiceSubtaskExport.java b/smartor/src/main/java/com/smartor/domain/ServiceSubtaskExport.java
index ffd4a0a..851d764 100644
--- a/smartor/src/main/java/com/smartor/domain/ServiceSubtaskExport.java
+++ b/smartor/src/main/java/com/smartor/domain/ServiceSubtaskExport.java
@@ -21,11 +21,11 @@
private static final long serialVersionUID = 1L;
/**
- * 浠诲姟鍚嶇О
+ * 绉戝鍚嶇О
*/
- @Excel(name = "浠诲姟鍚嶇О")
- @ApiModelProperty(value = "浠诲姟鍚嶇О")
- private String taskName;
+ @Excel(name = "绉戝鍚嶇О")
+ @ApiModelProperty(value = "绉戝鍚嶇О")
+ private String deptname;
/**
* 鍙戦�佷汉
@@ -33,20 +33,6 @@
@Excel(name = " 濮撳悕 ")
@ApiModelProperty(value = "鍙戦�佷汉")
private String sendname;
-
- /**
- * 鍙戦�佺姸鎬�
- */
- @Excel(name = " 浠诲姟鐘舵�� ")
- @ApiModelProperty(value = "鍙戦�佺姸鎬� 1 琚鍙�(鍦ㄤ换鍔′腑鏄柊寤猴紝鍦ㄦ湇鍔′腑鏄棰嗗彇) 2 寰呭彂閫� 3 宸插彂閫� 4 涓嶆墽琛� 5 鍙戦�佸け璐� 6 宸插畬鎴� 7 瓒呮椂(浜哄伐)")
- private Long sendstate;
-
- /**
- * 瀹屾垚鏃堕棿
- */
- @JsonFormat(pattern = "yyyy-MM-dd")
- @ApiModelProperty(value = "瀹屾垚鏃堕棿")
- private Date finishtime;
/**
* 鍑洪櫌鏃堕棿
@@ -63,6 +49,19 @@
@ApiModelProperty(value = "搴旈殢璁挎棩鏈�")
private Date visitTime;
+ /**
+ * 瀹屾垚鏃堕棿
+ */
+ @Excel(name = " 瀹屾垚鏃堕棿 ", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @ApiModelProperty(value = "瀹屾垚鏃堕棿")
+ private Date finishtime;
+
+ /**
+ * 闅忚浜哄憳
+ */
+ @Excel(name = "闅忚浜哄憳")
+ private String updateBy;
/**
* 鍖荤敓濮撳悕
@@ -71,15 +70,32 @@
@ApiModelProperty(value = "鍖荤敓濮撳悕")
private String drname;
- /**
- * 闅忚浜哄憳
- */
- @Excel(name = "闅忚浜哄憳")
- private String updateBy;
-
@Excel(name = "鍑洪櫌澶╂暟", suffix = "澶�")
@ApiModelProperty(value = "鍑洪櫌澶╂暟")
private Integer endDay;
+
+ /**
+ * 鍑洪櫌璇婃柇
+ */
+ @Excel(name = " 鍑洪櫌璇婃柇 ")
+ @ApiModelProperty(value = "鍑洪櫌璇婃柇")
+ private String leavediagname;
+
+
+ /**
+ * 鍙戦�佺姸鎬�
+ */
+// @Excel(name = " 浠诲姟鐘舵�� ")
+ @ApiModelProperty(value = "鍙戦�佺姸鎬� 1 琚鍙�(鍦ㄤ换鍔′腑鏄柊寤猴紝鍦ㄦ湇鍔′腑鏄棰嗗彇) 2 寰呭彂閫� 3 宸插彂閫� 4 涓嶆墽琛� 5 鍙戦�佸け璐� 6 宸插畬鎴� 7 瓒呮椂(浜哄伐)")
+ private Long sendstate;
+
+ /**
+ * 鍙戦�佺姸鎬�
+ */
+ @Excel(name = " 浠诲姟鐘舵�� ")
+ @ApiModelProperty(value = "鍙戦�佺姸鎬� 1 琚鍙�(鍦ㄤ换鍔′腑鏄柊寤猴紝鍦ㄦ湇鍔′腑鏄棰嗗彇) 2 寰呭彂閫� 3 宸插彂閫� 4 涓嶆墽琛� 5 鍙戦�佸け璐� 6 宸插畬鎴� 7 瓒呮椂(浜哄伐)")
+ private String stName;
+
/**
* 韬唤璇佸彿
@@ -105,14 +121,6 @@
/**
- * 绉戝鍚嶇О
- */
- @Excel(name = "绉戝鍚嶇О")
- @ApiModelProperty(value = "绉戝鍚嶇О")
- private String deptname;
-
-
- /**
* 鍑洪櫌鐥呭尯鍚嶇О
*/
@ApiModelProperty(value = "鍑洪櫌鐥呭尯鍚嶇О")
@@ -135,10 +143,18 @@
@Excel(name = "浠诲姟鎵ц鏂瑰紡")
private String preachform;
+ /**
+ * 浠诲姟鍚嶇О
+ */
+ @Excel(name = "浠诲姟鍚嶇О")
+ @ApiModelProperty(value = "浠诲姟鍚嶇О")
+ private String taskName;
+
/**
* 澶囨敞
*/
+ @Excel(name = "澶囨敞")
@ApiModelProperty(value = "澶囨敞")
private String remark;
--
Gitblit v1.9.3