From 907641e56c2085aaa81f267946dc3e3e9fca73e7 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 18 九月 2024 09:39:02 +0800
Subject: [PATCH] 代码提交

---
 smartor/src/main/java/com/smartor/domain/ServiceTask.java |   41 ++++++++++++++++++++++++++++++++++-------
 1 files changed, 34 insertions(+), 7 deletions(-)

diff --git a/smartor/src/main/java/com/smartor/domain/ServiceTask.java b/smartor/src/main/java/com/smartor/domain/ServiceTask.java
index fc7665e..4fdb5fd 100644
--- a/smartor/src/main/java/com/smartor/domain/ServiceTask.java
+++ b/smartor/src/main/java/com/smartor/domain/ServiceTask.java
@@ -8,6 +8,7 @@
 import lombok.Data;
 
 import java.util.Date;
+import java.util.List;
 
 /**
  * 璇煶浠诲姟瀵硅薄 ivr_task
@@ -15,7 +16,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,18 +120,18 @@
      *
      */
     @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")
+    @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")
+    @Excel(name = "  ", width = 30, dateFormat = "yyyy-MM-dd")
     @ApiModelProperty(value = "缁撴潫鏃堕棿")
     private Date endTime;
 
@@ -152,7 +153,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 checktime;
 
@@ -213,6 +214,13 @@
     private String deptcode;
 
     /**
+     * 閮ㄩ棬鍚嶇О
+     */
+    @Excel(name = "閮ㄩ棬鍚嶇О")
+    @ApiModelProperty(value = "閮ㄩ棬鍚嶇О")
+    private String deptname;
+
+    /**
      * 鍒犻櫎
      */
     @ApiModelProperty(value = "鍒犻櫎")
@@ -229,7 +237,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;
 
@@ -273,7 +281,7 @@
      */
     @Excel(name = " 鍙戦�佺姸鎬侊細 1鍒涘缓   2鎵ц涓�   3 鏆傚仠   4缁堟  5瀹屾垚 ")
     @ApiModelProperty(value = "鍙戦�佺姸鎬侊細 1鍒涘缓   2鎵ц涓�   3 鏆傚仠   4缁堟  5瀹屾垚 ")
-    private Integer sendState;
+    private Long sendState;
 
 //    /**
 //     * 鏂囨湰鍙橀噺鍙傛暟
@@ -339,4 +347,23 @@
 
     @ApiModelProperty(value = "灞曠ず鏃ユ湡")
     private String showDate;
+
+    @ApiModelProperty(value = "寮�鍦虹櫧")
+    private String kcb;
+
+    @ApiModelProperty(value = "缁撴潫璇�")
+    private String jsy;
+
+    /**
+     * 鍑洪櫌鐥呭尯缂栧彿
+     */
+    @ApiModelProperty(value = "鍑洪櫌鐥呭尯缂栧彿闆嗗悎")
+    private String leavehospitaldistrictcode;
+
+    /**
+     * 鍑洪櫌鐥呭尯鍚嶇О
+     */
+    @ApiModelProperty(value = "鍑洪櫌鐥呭尯鍚嶇О")
+    @Excel(name = " 鍑洪櫌鐥呭尯鍚嶇О ")
+    private String leavehospitaldistrictname;
 }

--
Gitblit v1.9.3