From ff087240b3dee29ce4e14ad0836e76b9fdf312cf Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期二, 19 八月 2025 09:28:07 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/lianhelihua_sh
---
server/src/main/java/com/doumee/core/constants/Constants.java | 50 +++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 41 insertions(+), 9 deletions(-)
diff --git a/server/src/main/java/com/doumee/core/constants/Constants.java b/server/src/main/java/com/doumee/core/constants/Constants.java
index a3daead..db47b51 100644
--- a/server/src/main/java/com/doumee/core/constants/Constants.java
+++ b/server/src/main/java/com/doumee/core/constants/Constants.java
@@ -40,6 +40,10 @@
public static final Integer FOUR = 4;
public static final Integer SIX = 6;
public static final Integer FIVE = 5;
+ public static final String QRCODE_URLS = "QRCODE_URLS";
+ public static final String SHE_QRCODES_URL = "SHE_QRCODES_URL";
+ public static final String DCA_QRCODES_URL = "DCA_QRCODES_URL";
+ public static final String DBH_QRCODES_URL = "DBH_QRCODES_URL";
public static boolean WORKORDER_SHE_EMAIL_SENDING = false;
public static boolean DEALING_COMPANY_SYNC = false ;
public static boolean DEALING_MEMBER_SYNC = false ;
@@ -57,7 +61,9 @@
*/
interface CacheKey {
}
-
+ public interface RedisKeys {
+ public static final String IMPORTING_CATEGORY = "IMPORTING_CATEGORY";
+ }
/**
* 鎿嶄綔绫诲瀷锛岀敤浜庡仛鎺ュ彛楠岃瘉鍒嗙粍
*/
@@ -226,31 +232,41 @@
public enum WorkOrderStatus{
- waitConfirm( 0, "寰呭垎閰峎TS","{title}涓婃姤",""),
- waitAllocation(1, "寰呭垎閰嶄换鍔�","寰呭垎閰嶄换鍔�",""),
- waitDeal(2, "寰呭鐞�","寰呭鐞�",""),
- sheClose(3, "宸茶В鍐�","SHE宸插叧闂�",""),
- wtsClose(4, "宸茶В鍐�","WTS宸插叧闂�",""),
- close(5, "宸茶В鍐�","宸茶В鍐�",""),
- urge (6, "鍌績","","")
+ waitConfirm( 0, "寰呭垎閰峎TS","{title}涓婃姤","","寰呭垎閰峎TS" ),
+ waitAllocation(1, "寰呭垎閰嶄换鍔�","寰呭垎閰嶄换鍔�","","寰呭垎閰嶄换鍔�"),
+ waitDeal(2, "寰呭鐞�","寰呭鐞�","","寰呭伐绋嬪笀澶勭悊"),
+ sheClose(3, "宸茶В鍐�","SHE宸插叧闂�","","SHE宸插叧闂�"),
+ wtsClose(4, "宸茶В鍐�","WTS宸插叧闂�","","WTS宸插叧闂�"),
+ close(5, "宸茶В鍐�","宸茶В鍐�","","宸ョ▼甯堝叧闂�"),
+ urge (6, "鍌績","","","")
;
private int status;
private String statusInfo;
+ private String statusName;
private String logTitle;
private String noticeContent;
// 鏋勯�犳柟娉�
- WorkOrderStatus(int status, String statusInfo,String logTitle,String noticeContent ) {
+ WorkOrderStatus(int status, String statusInfo,String logTitle,String noticeContent,String statusName ) {
this.status = status;
this.statusInfo = statusInfo;
this.logTitle = logTitle;
this.noticeContent = noticeContent;
+ this.statusName = statusName;
}
public static String getName(int index) {
for (WorkOrderStatus c : WorkOrderStatus.values()) {
if (c.getKey() == index) {
return c.statusInfo;
+ }
+ }
+ return null;
+ }
+ public static String getStatusName(int index) {
+ for (WorkOrderStatus c : WorkOrderStatus.values()) {
+ if (c.getKey() == index) {
+ return c.statusName;
}
}
return null;
@@ -264,6 +280,22 @@
this.status = status;
}
+ public int getStatus() {
+ return status;
+ }
+
+ public void setStatus(int status) {
+ this.status = status;
+ }
+
+ public String getStatusName() {
+ return statusName;
+ }
+
+ public void setStatusName(String statusName) {
+ this.statusName = statusName;
+ }
+
public String getStatusInfo() {
return statusInfo;
}
--
Gitblit v1.9.3