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/ServiceSubtask.java | 130 +++++++++++++++++++++++++++++++++++++------
1 files changed, 111 insertions(+), 19 deletions(-)
diff --git a/smartor/src/main/java/com/smartor/domain/ServiceSubtask.java b/smartor/src/main/java/com/smartor/domain/ServiceSubtask.java
index 6fab3a3..1646337 100644
--- a/smartor/src/main/java/com/smartor/domain/ServiceSubtask.java
+++ b/smartor/src/main/java/com/smartor/domain/ServiceSubtask.java
@@ -1,5 +1,6 @@
package com.smartor.domain;
+import java.math.BigDecimal;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
@@ -21,16 +22,53 @@
private static final long serialVersionUID = 1L;
/**
- *
+ * 涓婚敭
*/
@ApiModelProperty(value = "涓婚敭")
private Long id;
/**
- *
+ * 浠诲姟ID
*/
@ApiModelProperty(value = "浠诲姟ID")
private Long taskid;
+
+ /**
+ * 澶囨敞
+ */
+ @ApiModelProperty(value = "澶囨敞")
+ private String remark;
+
+ /**
+ * 澶囨敞
+ */
+ @ApiModelProperty(value = "澶囨敞")
+ private String guid;
+
+ /**
+ * 寮傚父鏍囪瘑
+ */
+ @ApiModelProperty(value = "寮傚父鏍囪瘑")
+ @Excel(name = " 寮傚父鏍囪瘑 ")
+ private String excep;
+
+ /**
+ * 鍑洪櫌鏃堕棿
+ */
+ @ApiModelProperty(value = "鍑洪櫌鏃堕棿")
+ private Date endtime;
+
+ /**
+ * 鍏ラ櫌鏃堕棿
+ */
+ @ApiModelProperty(value = "鍏ラ櫌鏃堕棿")
+ private Date starttime;
+
+ /**
+ * 鏄惁鎻愪氦
+ */
+ @ApiModelProperty(value = "鏄惁鎻愪氦锛�0鏈彁浜� 1宸叉彁浜�")
+ private Long submit;
/**
* 鍙戦�佷汉
@@ -96,6 +134,13 @@
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;
+
+ /**
* 妯℃澘ID
*/
@Excel(name = " 妯℃澘ID")
@@ -108,6 +153,13 @@
@Excel(name = " 妯℃澘鍚� ")
@ApiModelProperty(value = "鎷夊彇鏃堕棿")
private String templatename;
+
+ /**
+ * 鍙戝鐞嗘剰瑙侊細1鏆備笉澶勭悊銆�2閫氱煡灏辫瘖銆�3鐥呮儏绋冲畾銆�4浜哄伐闅忚銆�5澶辫閫乁UID
+ */
+ @Excel(name = " 澶勭悊鎰忚锛�1鏆備笉澶勭悊銆�2閫氱煡灏辫瘖銆�3鐥呮儏绋冲畾銆�4浜哄伐闅忚銆�5澶辫 ")
+ @ApiModelProperty(value = "澶勭悊鎰忚锛�1鏆備笉澶勭悊銆�2閫氱煡灏辫瘖銆�3鐥呮儏绋冲畾銆�4浜哄伐闅忚銆�5澶辫")
+ private String suggest;
/**
* 鍙戦�佹棩鏈�
@@ -163,8 +215,15 @@
* 鍙戦�佺姸鎬�
*/
@Excel(name = " 鍙戦�佺姸鎬� ")
- @ApiModelProperty(value = "鍙戦�佺姸鎬� 1 琚鍙� 2 寰呭彂閫� 3 宸插彂閫�")
+ @ApiModelProperty(value = "鍙戦�佺姸鎬� 1 琚鍙� 2 寰呭彂閫� 3 宸插彂閫� 4 涓嶆墽琛� 5 鍙戦�佸け璐�")
private Long sendstate;
+
+ /**
+ * 鏆傚仠鐘� 锛� 鐘舵�佸鏋滃彂鐢熶慨鏀癸紝鍊煎氨鍔�1
+ */
+ @Excel(name = " 鏆傚仠鐘� 锛� 鐘舵�佸鏋滃彂鐢熶慨鏀癸紝鍊煎氨鍔�1 ")
+ @ApiModelProperty(value = "鏆傚仠鐘� 锛� 鐘舵�佸鏋滃彂鐢熶慨鏀癸紝鍊煎氨鍔�1")
+ private Long stopState;
/**
* 鍙戦�乁UID
@@ -183,8 +242,7 @@
/**
* 瀹屾垚鏃堕棿
*/
- @JsonFormat(pattern = "yyyy-MM-dd")
- @Excel(name = " 瀹屾垚鏃堕棿 ", width = 30, dateFormat = "yyyy-MM-dd")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "瀹屾垚鏃堕棿")
private Date finishtime;
@@ -216,6 +274,20 @@
@Excel(name = " 閮ㄩ棬code")
@ApiModelProperty(value = "閮ㄩ棬code")
private String deptcode;
+
+ /**
+ * 鍖荤敓缂栫爜
+ */
+ @Excel(name = " 鍖荤敓缂栫爜")
+ @ApiModelProperty(value = "鍖荤敓缂栫爜")
+ private String drcode;
+
+ /**
+ * 鍖荤敓濮撳悕
+ */
+ @Excel(name = " 鍖荤敓濮撳悕")
+ @ApiModelProperty(value = "鍖荤敓濮撳悕")
+ private String drname;
/**
* 鏍囩鐘舵��
@@ -251,20 +323,6 @@
@Excel(name = " 鏈烘瀯ID ")
@ApiModelProperty(value = "鏈烘瀯ID")
private String orgid;
-
- /**
- * 鐖禝D
- */
- @Excel(name = "鐖禝D")
- @ApiModelProperty(value = "鐖禝D")
- private Long pid;
-
- /**
- * GUID
- */
- @Excel(name = "GUID")
- @ApiModelProperty(value = "GUID")
- private String guid;
/**
* 鏂囨湰鍙橀噺鍙傛暟
@@ -402,6 +460,13 @@
private Long libtemplateid;
/**
+ * 鎬诲垎
+ */
+ @Excel(name = "鎬诲垎")
+ @ApiModelProperty(value = "鎬诲垎")
+ private BigDecimal score;
+
+ /**
* 妯℃澘搴撴ā鐗堝悕绉�
*/
@Excel(name = "妯℃澘搴撴ā鐗堝悕绉�")
@@ -416,4 +481,31 @@
@ApiModelProperty(value = "闀挎湡浠诲姟锛岀粰鎮ｈ�呭彂閫佺殑鏃堕棿")
private Date longSendTime;
+ /**
+ * 璐ｄ换鎶ゅ＋缂栫爜
+ */
+ @Excel(name = "璐ｄ换鎶ゅ＋缂栫爜")
+ @ApiModelProperty("璐ｄ换鎶ゅ＋缂栫爜")
+ private String nurseId;
+
+ /**
+ * 璐ｄ换鎶ゅ＋濮撳悕
+ */
+ @Excel(name = "璐ｄ换鎶ゅ＋濮撳悕")
+ @ApiModelProperty("璐ｄ换鎶ゅ＋濮撳悕")
+ private String nurseName;
+
+ /**
+ * 鍑洪櫌鐥呭尯缂栧彿
+ */
+ @ApiModelProperty(value = "鍑洪櫌鐥呭尯缂栧彿")
+ private String leavehospitaldistrictcode;
+
+ /**
+ * 鍑洪櫌鐥呭尯鍚嶇О
+ */
+ @ApiModelProperty(value = "鍑洪櫌鐥呭尯鍚嶇О")
+ @Excel(name = " 鍑洪櫌鐥呭尯鍚嶇О ")
+ private String leavehospitaldistrictname;
+
}
--
Gitblit v1.9.3