From d2902daad7261ac7d0148dbb9f33f39e52d433f6 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 16 八月 2024 18:15:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/system_service/src/main/java/com/doumee/core/utils/Constants.java | 20 ++++++++++++++------
1 files changed, 14 insertions(+), 6 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 8646006..90cea78 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
@@ -38,6 +38,13 @@
public static final String HK_PUSH_URL = "HK_PUSH_URL";
public static final String HK_ROOTORG_CODE ="HK_ROOTORG_CODE" ;
public static final String HK_ROOTORG_NAME ="HK_ROOTORG_NAME" ;
+ public static final String PLATFORM ="PLATFORM" ;
+ public static final String RESERVATION_TOTAL_NUM ="RESERVATION_TOTAL_NUM" ;
+ public static final String SIGN_IN_PLACE_LAT ="SIGN_IN_PLACE_LAT" ;
+ public static final String SIGN_IN_PLACE_LNT ="SIGN_IN_PLACE_LNT" ;
+ public static final String SIGN_IN_PLACE_DISTANCE ="SIGN_IN_PLACE_DISTANCE" ;
+ public static final String SIGN_IN_QRCODE ="SIGN_IN_QRCODE" ;
+
//琚嫓璁夸汉淇℃伅鏍￠獙鏂瑰紡锛�0鎵嬫満鍙峰崟鐙牎楠� 1鎵嬫満鍙峰拰濮撳悕缁勫悎鏍￠獙锛�
public static final String BEVISITED_USER_VALID = "BEVISITED_USER_VALID";
@@ -173,6 +180,8 @@
int wxczh = 3;
int sgscxh = 4;
}
+
+
public static Date getBirthdyByCardNo(String idCard){
if(idCard ==null || idCard.length()<14){
return null;
@@ -715,15 +724,14 @@
* 0寰呯‘璁� 1寰呯鍒� 2绛夊緟鍙彿 3鍏ュ洯绛夊緟 4宸插彨鍙� 5浣滀笟涓� 6浣滀笟瀹屾垚 7杞Щ涓� 8寮傚父鎸傝捣 9宸叉巿鏉冪鍥� 10宸茬鍥� 11 宸茶繃鍙�
*/
public enum PlatformJobStatus {
- WAIT_CONFIRM(0, "寰呯‘璁�","" ),
- WART_SIGNIN(1, "寰呯鍒�","寰呯鍒�" ),
- WAIT_CALL(2, "绛夊緟鍙彿","绛夊緟鍙彿"),
- IN_WAIT(3, "鍏ュ洯绛夊緟","鍏ュ洯绛夊緟" ),
+ WAIT_CONFIRM(0, "寰呯‘璁�","寰呯‘璁�" ),
+ WART_SIGN_IN(1, "寰呯鍒�","寰呯鍒�" ),
+ WAIT_CALL(2, "宸茬鍒�","宸茬鍒�"), //绛夊緟鍙彿鍏ュ洯
+ IN_WAIT(3, "鍏ュ洯绛夊緟","鍏ュ洯绛夊緟" ),//宸插叆鍥� 鏈彨鍙疯繘鍏ユ湀鍙�
CALLED(4, "宸插彨鍙�","宸插彨鍙�" ),
WORKING(5, "浣滀笟涓�","浣滀笟涓�" ),
- //缁繚閫氱煡
DONE(6, "浣滀笟瀹屾垚 ","浣滀笟瀹屾垚 " ),
- TRANSFERING(7, "杞Щ涓�","7杞Щ涓�" ),
+ TRANSFERING(7, "杞Щ涓�","杞Щ涓�" ),
EXCEPTION(8, "寮傚父鎸傝捣","寮傚父鎸傝捣" ),
AUTHED_LEAVE(9, "宸叉巿鏉冪鍥�","宸叉巿鏉冪鍥�" ),
LEAVED(10, "宸茬鍥� ","宸茬鍥� " ),
--
Gitblit v1.9.3