From 9526971c403417c1c007804f24884c443b9e6cd7 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 04 九月 2024 00:34:40 +0800
Subject: [PATCH] 代码提交
---
smartor/src/main/java/com/smartor/domain/ServiceTask.java | 45 ++++++++++++++++++++++++++++++++++-----------
1 files changed, 34 insertions(+), 11 deletions(-)
diff --git a/smartor/src/main/java/com/smartor/domain/ServiceTask.java b/smartor/src/main/java/com/smartor/domain/ServiceTask.java
index 850bf5d..fc7665e 100644
--- a/smartor/src/main/java/com/smartor/domain/ServiceTask.java
+++ b/smartor/src/main/java/com/smartor/domain/ServiceTask.java
@@ -15,7 +15,7 @@
* @author smartor
* @date 2023-03-24
*/
-@ApiModel(value = "ServiceTask", description = "浠诲姟瀵硅薄")
+@ApiModel(value = "ServiceTask" , description = "浠诲姟瀵硅薄")
@Data
public class ServiceTask extends BaseEntity {
private static final long serialVersionUID = 1L;
@@ -119,9 +119,20 @@
*
*/
@JsonFormat(pattern = "yyyy-MM-dd")
- @Excel(name = " ", width = 30, dateFormat = "yyyy-MM-dd")
+ @Excel(name = " " , width = 30, dateFormat = "yyyy-MM-dd")
@ApiModelProperty(value = "娣诲姞鏃堕棿")
private Date addtime;
+
+
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @Excel(name = " " , width = 30, dateFormat = "yyyy-MM-dd")
+ @ApiModelProperty(value = "寮�濮嬫椂闂�")
+ private Date beginTime;
+
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @Excel(name = " " , width = 30, dateFormat = "yyyy-MM-dd")
+ @ApiModelProperty(value = "缁撴潫鏃堕棿")
+ private Date endTime;
/**
* 瀹℃牳浜篿d
@@ -141,16 +152,23 @@
* 瀹℃牳浜烘椂闂�
*/
@JsonFormat(pattern = "yyyy-MM-dd")
- @Excel(name = " ", width = 30, dateFormat = "yyyy-MM-dd")
+ @Excel(name = " " , width = 30, dateFormat = "yyyy-MM-dd")
@ApiModelProperty(value = "瀹℃牳浜烘椂闂�")
private Date checktime;
/**
- * "1锛岄殢璁匡紱2锛岄棶鍗凤紱3.瀹ｆ暀锛�
+ * 浠诲姟绫诲瀷:1銆佺洃娴嬭瘎浼�;2銆佸嚭闄㈤殢璁�;3銆侀棬璇婇殢璁�
*/
- @Excel(name = "1锛岄殢璁匡紱2锛岄棶鍗凤紱3.瀹ｆ暀锛� ")
- @ApiModelProperty(value = "1锛岄殢璁匡紱2锛岄棶鍗凤紱3.瀹ｆ暀锛�")
+ @Excel(name = "浠诲姟绫诲瀷(閫氱煡銆侀棶鍗枫�佹満鍣ㄤ汉璇煶)")
+ @ApiModelProperty(value = "浠诲姟绫诲瀷(閫氱煡銆侀棶鍗枫�佹満鍣ㄤ汉璇煶)")
private String type;
+
+ /**
+ * 鏈嶅姟绫诲瀷(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銆佸叾浠栭�氱煡)")
+ private String serviceType;
/**
* 绫诲瀷鍚嶇О
@@ -158,7 +176,6 @@
@Excel(name = "绫诲瀷鍚嶇О")
@ApiModelProperty(value = "绫诲瀷鍚嶇О")
private String typename;
-
/**
* 绫诲瀷鍚嶇О
@@ -212,7 +229,7 @@
* 涓婁紶鏃堕棿
*/
@JsonFormat(pattern = "yyyy-MM-dd")
- @Excel(name = " 涓婁紶鏃堕棿 ", width = 30, dateFormat = "yyyy-MM-dd")
+ @Excel(name = " 涓婁紶鏃堕棿 " , width = 30, dateFormat = "yyyy-MM-dd")
@ApiModelProperty(value = "涓婁紶鏃堕棿")
private Date uploadTime;
@@ -245,10 +262,10 @@
private String preachform;
/**
- * 鍙戦�佺被鍨�: 1鎸囧畾鏃堕棿鍙戦�� 2鍗冲埢鍙戦��
+ * 鍙戦�佺被鍨�: 1鎸囧畾鏃堕棿娈靛彂閫� 2鍗冲埢鍙戦�� 3鏃堕棿鐐�
*/
- @Excel(name = " 鍙戦�佺被鍨�: 1鎸囧畾鏃堕棿鍙戦�� 2鍗冲埢鍙戦�� ")
- @ApiModelProperty(value = "鍙戦�佺被鍨�: 1鎸囧畾鏃堕棿鍙戦�� 2鍗冲埢鍙戦�� 3鏃堕棿鐐�")
+ @Excel(name = " 鍙戦�佺被鍨�: 1鎸囧畾鏃堕棿娈靛彂閫� 2鍗冲埢鍙戦�� 3鏃堕棿鐐�")
+ @ApiModelProperty(value = "鍙戦�佺被鍨�: 1鎸囧畾鏃堕棿娈靛彂閫� 2鍗冲埢鍙戦�� 3鏃堕棿鐐�")
private Long sendType;
/**
@@ -278,6 +295,12 @@
private Integer pageSize;
/**
+ * pageSize
+ */
+ @ApiModelProperty("鏄惁鏄暱鏈熶换鍔� 0锛氫笉鏄� 1锛氭槸")
+ private Integer longTask;
+
+ /**
* 灏辫瘖绫诲瀷锛�1闂ㄨ瘖 2鍑洪櫌锛�
*/
@Excel(name = " 灏辫瘖绫诲瀷锛�1闂ㄨ瘖 2鍑洪櫌锛�")
--
Gitblit v1.9.3