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 | 55 +++++++++++++++++++++++++++++++++++++++++++++++-------- 1 files changed, 47 insertions(+), 8 deletions(-) diff --git a/smartor/src/main/java/com/smartor/domain/ServiceTask.java b/smartor/src/main/java/com/smartor/domain/ServiceTask.java index f251ef0..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 @@ -157,11 +158,18 @@ private Date checktime; /** - * "1锛岄殢璁匡紱2锛岄棶鍗凤紱3.瀹f暀锛� + * 浠诲姟绫诲瀷:1銆佺洃娴嬭瘎浼�;2銆佸嚭闄㈤殢璁�;3銆侀棬璇婇殢璁� */ - @Excel(name = "1锛岄殢璁匡紱2锛岄棶鍗凤紱3.瀹f暀锛� ") - @ApiModelProperty(value = "1锛岄殢璁匡紱2锛岄棶鍗凤紱3.瀹f暀锛�") + @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; /** * 绫诲瀷鍚嶇О @@ -169,7 +177,6 @@ @Excel(name = "绫诲瀷鍚嶇О") @ApiModelProperty(value = "绫诲瀷鍚嶇О") private String typename; - /** * 绫诲瀷鍚嶇О @@ -205,6 +212,13 @@ @Excel(name = "閮ㄩ棬code") @ApiModelProperty(value = "閮ㄩ棬code") private String deptcode; + + /** + * 閮ㄩ棬鍚嶇О + */ + @Excel(name = "閮ㄩ棬鍚嶇О") + @ApiModelProperty(value = "閮ㄩ棬鍚嶇О") + private String deptname; /** * 鍒犻櫎 @@ -256,10 +270,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; /** @@ -267,7 +281,7 @@ */ @Excel(name = " 鍙戦�佺姸鎬侊細 1鍒涘缓 2鎵ц涓� 3 鏆傚仠 4缁堟 5瀹屾垚 ") @ApiModelProperty(value = "鍙戦�佺姸鎬侊細 1鍒涘缓 2鎵ц涓� 3 鏆傚仠 4缁堟 5瀹屾垚 ") - private Integer sendState; + private Long sendState; // /** // * 鏂囨湰鍙橀噺鍙傛暟 @@ -287,6 +301,12 @@ */ @ApiModelProperty("pageSize") private Integer pageSize; + + /** + * pageSize + */ + @ApiModelProperty("鏄惁鏄暱鏈熶换鍔� 0锛氫笉鏄� 1锛氭槸") + private Integer longTask; /** * 灏辫瘖绫诲瀷锛�1闂ㄨ瘖 2鍑洪櫌锛� @@ -327,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