From 2d1db09ab80b4f164ca9dd66b18d0992203fa417 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期二, 21 十月 2025 14:43:39 +0800
Subject: [PATCH] 新增Orgid

---
 smartor/src/main/java/com/smartor/domain/ServiceTask.java |   42 +++++++++++++++++++++++++++++++++++-------
 1 files changed, 35 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 f0d9e35..73c0a69 100644
--- a/smartor/src/main/java/com/smartor/domain/ServiceTask.java
+++ b/smartor/src/main/java/com/smartor/domain/ServiceTask.java
@@ -165,17 +165,17 @@
     private Date checktime;
 
     /**
-     * 浠诲姟绫诲瀷:1銆佺洃娴嬭瘎浼�;2銆佸嚭闄㈤殢璁�;3銆侀棬璇婇殢璁�
+     * 浠诲姟绫诲瀷锛�1锛屾満鍣ㄤ汉璇煶  2锛岄棶鍗凤紱3锛岄�氱煡锛�
      */
-    @Excel(name = "浠诲姟绫诲瀷(閫氱煡銆侀棶鍗枫�佹満鍣ㄤ汉璇煶)")
-    @ApiModelProperty(value = "浠诲姟绫诲瀷(閫氱煡銆侀棶鍗枫�佹満鍣ㄤ汉璇煶)")
+    @Excel(name = "浠诲姟绫诲瀷锛�1锛屾満鍣ㄤ汉璇煶  2锛岄棶鍗凤紱3锛岄�氱煡锛�")
+    @ApiModelProperty(value = "浠诲姟绫诲瀷锛�1锛屾満鍣ㄤ汉璇煶  2锛岄棶鍗凤紱3锛岄�氱煡锛�")
     private String type;
 
     /**
-     * 鏈嶅姟绫诲瀷(1銆佺洃娴嬭瘎浼帮紱2銆佸嚭闄㈤殢璁匡紱3銆侀棬璇婇殢璁匡紱4銆佸鏁欏叧鎬�锛�5銆佸璇婇�氱煡锛�6銆佹弧鎰忓害璋冩煡锛�7銆佹偅鑰呮姤鍛婏紱 8銆佸叾浠栭�氱煡)
+     * "鏈嶅姟绫诲瀷(1銆佺洃娴嬭瘎浼帮紱2銆佸嚭闄㈤殢璁匡紱3銆侀棬璇婇殢璁匡紱4銆佸鏁欏叧鎬�锛�5銆佸璇婄鐞嗭紱6銆佷綇闄㈡弧鎰忓害璋冩煡锛�7銆佹偅鑰呮姤鍛婏紱 8銆佸叾浠栭�氱煡 9浣撴闅忚 10.鍖绘妧闅忚  11锛屽奖鍍忎笓绉戦殢璁�  12銆佸績鐢典笓绉戦殢璁匡紝 13涓撶闅忚   14銆侀棬璇婃弧鎰忓害璋冩煡  15鎶曡瘔寤鸿"
      */
-    @Excel(name = "鏈嶅姟绫诲瀷(1銆佺洃娴嬭瘎浼帮紱2銆佸嚭闄㈤殢璁匡紱3銆侀棬璇婇殢璁匡紱4銆佸鏁欏叧鎬�锛�5銆佸璇婇�氱煡锛�6銆佹弧鎰忓害璋冩煡锛�7銆佹偅鑰呮姤鍛婏紱 8銆佸叾浠栭�氱煡)")
-    @ApiModelProperty(value = "鏈嶅姟绫诲瀷(1銆佺洃娴嬭瘎浼帮紱2銆佸嚭闄㈤殢璁匡紱3銆侀棬璇婇殢璁匡紱4銆佸鏁欏叧鎬�锛�5銆佸璇婇�氱煡锛�6銆佹弧鎰忓害璋冩煡锛�7銆佹偅鑰呮姤鍛婏紱 8銆佸叾浠栭�氱煡)")
+    @Excel(name = "鏈嶅姟绫诲瀷(1銆佺洃娴嬭瘎浼帮紱2銆佸嚭闄㈤殢璁匡紱3銆侀棬璇婇殢璁匡紱4銆佸鏁欏叧鎬�锛�5銆佸璇婄鐞嗭紱6銆佷綇闄㈡弧鎰忓害璋冩煡锛�7銆佹偅鑰呮姤鍛婏紱 8銆佸叾浠栭�氱煡 9浣撴闅忚 10.鍖绘妧闅忚  11锛屽奖鍍忎笓绉戦殢璁�  12銆佸績鐢典笓绉戦殢璁匡紝 13涓撶闅忚   14銆侀棬璇婃弧鎰忓害璋冩煡  15鎶曡瘔寤鸿 16璇鹃闅忚")
+    @ApiModelProperty(value = "鏈嶅姟绫诲瀷(1銆佺洃娴嬭瘎浼帮紱2銆佸嚭闄㈤殢璁匡紱3銆侀棬璇婇殢璁匡紱4銆佸鏁欏叧鎬�锛�5銆佸璇婄鐞嗭紱6銆佷綇闄㈡弧鎰忓害璋冩煡锛�7銆佹偅鑰呮姤鍛婏紱 8銆佸叾浠栭�氱煡 9浣撴闅忚 10.鍖绘妧闅忚  11锛屽奖鍍忎笓绉戦殢璁�  12銆佸績鐢典笓绉戦殢璁匡紝 13涓撶闅忚   14銆侀棬璇婃弧鎰忓害璋冩煡  15鎶曡瘔寤鸿 16璇鹃闅忚")
     private String serviceType;
 
     /**
@@ -276,6 +276,9 @@
     @ApiModelProperty(value = " 浠诲姟褰㈠紡 1,澶氬獟浣�   2,绾歌川  3,鐢佃瘽  4,鐭俊  5.寰俊鍏紬鍙� 6.寰俊灏忕▼搴�  7.鏀粯瀹�  8.鏅鸿兘灏忕▼搴�  9.閽夐拤 ")
     private String preachform;
 
+    @ApiModelProperty(value = " 浠诲姟褰㈠紡鎻忚堪")
+    private String preachformDesc;
+
     /**
      * 鍙戦�佺被鍨�: 1鎸囧畾鏃堕棿娈靛彂閫� 2鍗冲埢鍙戦�� 3鏃堕棿鐐�
      */
@@ -312,7 +315,7 @@
     /**
      * pageSize
      */
-    @ApiModelProperty("鏄惁鏄暱鏈熶换鍔� 0锛氫笉鏄�    1锛氭槸")
+    @ApiModelProperty("鏄惁鏄暱鏈熶换鍔� 0锛氫复鏃朵换鍔�    1锛氶暱鏈熶换鍔�   2鍥哄畾浠诲姟   3寰幆浠诲姟")
     private Integer longTask;
 
     /**
@@ -409,4 +412,29 @@
 
     @ApiModelProperty(value = "鏄惁寰幆鎵ц鎮h�咃紙0:涓嶅惊鐜�           1锛氬惊鐜級")
     private Long patCycle;
+    /**
+     * 鏄惁鏈変笅涓换鍔★紝鐢ㄤ簬澶氫换鍔″叧鑱�
+     */
+    @ApiModelProperty(value = "鏄惁鏈変笅涓换鍔★紙0:鏃� 1锛氭湁锛�")
+    @Excel(name = "鏄惁鏈変笅涓换鍔★紙0:鏃� 1锛氭湁锛�")
+    private String nexttaskflag;
+    /**
+     * 涓嬩竴涓换鍔d
+     */
+    @ApiModelProperty(value = "涓嬩竴涓换鍔d")
+    @Excel(name = " 涓嬩竴涓换鍔d")
+    private Long nexttaskid;
+    /**
+     * 涓嬩竴涓换鍔″悕绉�
+     */
+    @ApiModelProperty(value = "涓嬩竴涓换鍔″悕绉�")
+    @Excel(name = " 涓嬩竴涓换鍔″悕绉�")
+    private String nexttaskname;
+
+    /**
+     * 閫傜敤鏉′欢绫诲瀷锛�1銆佹寜绉戝銆�2銆佹寜鐥呭尯銆�3銆佹寜鐤剧梾璇婃柇銆�4銆佹寜鎵嬫湳绫诲瀷
+     */
+    @ApiModelProperty(value = "閫傜敤鏉′欢绫诲瀷锛�1銆佹寜绉戝銆�2銆佹寜鐥呭尯銆�3銆佹寜鐤剧梾璇婃柇銆�4銆佹寜鎵嬫湳绫诲瀷")
+    @Excel(name = "閫傜敤鏉′欢绫诲瀷锛�1銆佹寜绉戝銆�2銆佹寜鐥呭尯銆�3銆佹寜鐤剧梾璇婃柇銆�4銆佹寜鎵嬫湳绫诲瀷")
+    private String appltype;
 }

--
Gitblit v1.9.3