From 843d0abd014ec20424844546fc57a9f976f366ba Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 02 九月 2024 10:52:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/system_service/src/main/java/com/doumee/core/utils/Constants.java | 25 +++++++++++++------------
1 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/server/system_service/src/main/java/com/doumee/core/utils/Constants.java b/server/system_service/src/main/java/com/doumee/core/utils/Constants.java
index e8788fc..9a829ed 100644
--- a/server/system_service/src/main/java/com/doumee/core/utils/Constants.java
+++ b/server/system_service/src/main/java/com/doumee/core/utils/Constants.java
@@ -746,17 +746,18 @@
* 0浠诲姟鍒涘缓 1鍙告満纭浠诲姟 2鍙告満绛惧埌 3鍏ュ洯绛夊緟 4鏈堝彴鍙彿 5寮�濮嬩綔涓� 6浣滀笟瀹屾垚 7鏈堝彴杞Щ 8浠诲姟鎸傝捣 9涓嬪彂鎺堟潈绂诲洯 10绂诲洯
*/
public enum PlatformJobLogType {
- CREATE(0, "浠诲姟鍒涘缓","浠诲姟鍒涘缓" ),
- CONFIRM_TASK(1, "鍙告満纭浠诲姟","鍙告満纭浠诲姟" ),
- SIGN(2, "鍙告満绛惧埌","鍙告満绛惧埌"),
- IN_WAIT(3, "鍏ュ洯绛夊緟","鍏ュ洯绛夊緟" ),
- CALLED(4, "鏈堝彴鍙彿","鏈堝彴鍙彿" ),
- WORKING(5, "寮�濮嬩綔涓�","寮�濮嬩綔涓�" ),
- DONE(6, "浣滀笟瀹屾垚 ","浣滀笟瀹屾垚 " ),
- TRANSFERING(7, "鏈堝彴杞Щ","鏈堝彴杞Щ" ),
- EXCEPTION(8, "浠诲姟鎸傝捣","浠诲姟鎸傝捣" ),
+ CREATE(0, "浠诲姟鍒涘缓","鍏ュ洯棰勭害鎴愬姛" ),
+ CONFIRM_TASK(1, "鍙告満纭浠诲姟","宸插畬鎴愭椂闂寸‘璁�" ),
+ SIGN(2, "鍙告満绛惧埌","鎺掗槦绛夊緟鍙彿"),
+ IN_WAIT(3, "鍏ュ洯绛夊緟","鍙彿鍏ュ洯绛夊緟" ),
+ CALLED(4, "鏈堝彴鍙彿","{data}鍙彿" ),
+ WORKING(5, "寮�濮嬩綔涓�","杩涘叆{data}寮�濮嬩綔涓�" ),
+ DONE(6, "浣滀笟瀹屾垚 ","鏈堝彴浣滀笟瀹屾垚锛岄┒绂绘湀鍙�" ),
+ TRANSFERING(7, "鏈堝彴杞Щ","{data}鍙戣捣鏈堝彴杞Щ" ),
+ EXCEPTION(8, "浠诲姟鎸傝捣","浣滀笟寮傚父琚寕璧�" ),
AUTHED_LEAVE(9, "涓嬪彂鎺堟潈绂诲洯","涓嬪彂鎺堟潈绂诲洯" ),
- LEAVED(10, "宸茬鍥� ","宸茬鍥� " ),
+ LEAVED(10, "宸茬鍥� ","杞﹁締浠巤data}绂诲満 " ),
+ OVER_NUMBER(11, "宸茶繃鍙�","瓒呮椂鏈埌鎸囧畾鏈堝彴鑷姩杩囧彿" ),
;
// 鎴愬憳鍙橀噺
@@ -811,8 +812,8 @@
public enum PlatformJobStatus {
WAIT_CONFIRM(0, "寰呯‘璁�","寰呯‘璁�" ),
WART_SIGN_IN(1, "寰呯鍒�","寰呯鍒�" ),
- WAIT_CALL(2, "宸茬鍒�","宸茬鍒�"), //绛夊緟鍙彿鍏ュ洯
- IN_WAIT(3, "鍏ュ洯绛夊緟","鍏ュ洯绛夊緟" ),//宸插叆鍥� 鏈彨鍙疯繘鍏ユ湀鍙�
+ WAIT_CALL(2, "宸茬鍒�","宸茬鍒�"),
+ IN_WAIT(3, "鍏ュ洯绛夊緟","鍏ュ洯绛夊緟" ),
CALLED(4, "宸插彨鍙�","宸插彨鍙�" ),
WORKING(5, "浣滀笟涓�","浣滀笟涓�" ),
DONE(6, "浣滀笟瀹屾垚 ","浣滀笟瀹屾垚 " ),
--
Gitblit v1.9.3