From 4d4394311a96e15ea204e2cae03dda00750d0fdd Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 11 四月 2025 17:37:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/src/main/java/com/doumee/core/constants/Constants.java | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 54 insertions(+), 3 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 f864c8c..265f93c 100644
--- a/server/src/main/java/com/doumee/core/constants/Constants.java
+++ b/server/src/main/java/com/doumee/core/constants/Constants.java
@@ -22,6 +22,8 @@
public static final String QYWX_CORPID = "QYWX_CORPID";
public static final String QYWX_SECRET = "QYWX_SECRET";
public static final String QYWX_TOKEN = "QYWX_TOKEN";
+ public static final String QYWX_AGENTID = "QYWX_AGENTID";
+
public static final String QYWX = "QYWX";
public static final Integer ONE = 1;
public static final Integer TWO = 2;
@@ -30,6 +32,7 @@
public static boolean DEALING_COMPANY_SYNC = false ;
public static boolean DEALING_MEMBER_SYNC = false ;
public static final String WORKORDER_FILE_PATH ="WORKORDER_FILE_PATH" ;
+ public static final String WORKORDER_LOG_FILE_PATH ="WORKORDER_LOG_FILE_PATH" ;
public static final String REDIS_TOKEN_KEY = "token_";
/**
@@ -199,14 +202,14 @@
// int dcaWorkOrder= 7;
//0宸ュ崟涓婃姤 1宸ュ崟澶勭悊 2宸ュ崟杞氦
- int upload = 0;
+ int upload = 0;
int deal = 1;
int passOn = 2;
}
- public enum workOrderStatus{
- waitConfirm( 0, "寰呭垎閰峎TS","寰呭垎閰峎TS",""),
+ public enum WorkOrderStatus{
+ waitConfirm( 0, "寰呭垎閰峎TS","{title}涓婃姤",""),
waitAllocation(1, "寰呭垎閰嶄换鍔�","寰呭垎閰嶄换鍔�",""),
waitDeal(2, "寰呭鐞�","寰呭鐞�",""),
sheClose(3, "宸茶В鍐�","SHE宸插叧闂�",""),
@@ -219,5 +222,53 @@
private String statusInfo;
private String logTitle;
private String noticeContent;
+
+ // 鏋勯�犳柟娉�
+ WorkOrderStatus(int status, String statusInfo,String logTitle,String noticeContent ) {
+ this.status = status;
+ this.statusInfo = statusInfo;
+ this.logTitle = logTitle;
+ this.noticeContent = noticeContent;
+ }
+ public static String getName(int index) {
+ for (WorkOrderStatus c : WorkOrderStatus.values()) {
+ if (c.getKey() == index) {
+ return c.statusInfo;
+ }
+ }
+ return null;
+ }
+
+ public int getKey() {
+ return status;
+ }
+
+ public void setKey(int key) {
+ this.status = status;
+ }
+
+ public String getStatusInfo() {
+ return statusInfo;
+ }
+
+ public void setStatusInfo(String statusInfo) {
+ this.statusInfo = statusInfo;
+ }
+
+ public String getLogTitle() {
+ return logTitle;
+ }
+
+ public void setLogTitle(String logTitle) {
+ this.logTitle = logTitle;
+ }
+
+ public String getNoticeContent() {
+ return noticeContent;
+ }
+
+ public void setNoticeContent(String noticeContent) {
+ this.noticeContent = noticeContent;
+ }
}
}
--
Gitblit v1.9.3