From b8e554b2db1933319eedc2a1b9e6a013dce6e299 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期一, 23 十二月 2024 18:05:27 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit
---
server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/TMSContants.java | 19 +++++++++++++++++--
1 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/TMSContants.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/TMSContants.java
index 5c30aeb..eabface 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/TMSContants.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/TMSContants.java
@@ -21,6 +21,8 @@
String[] getGis = new String[]{"/tms/zhyt/getGis", "銆怲MS銆戞牴鎹繍杈撳崟鍙锋煡璇is杞�"};//TMS鏍规嵁杩愯緭鍗曞彿鏌ヨgis杞ㄦ帴鍙ｅ湴鍧�
String[] getOrderStatusByContractNumber = new String[]{"/tms/zhyt/getOrderStatusByContractNumber", "銆怲MS銆戝崟鐢熷懡鍛ㄦ湡"};//3.8璁㈠崟鐢熷懡鍛ㄦ湡
String[] getOutQtyAndVehicleQty = new String[]{"/tms/zhyt/getOutQtyAndVehicleQty", "銆怲MS銆戞寚瀹氭椂闂磋寖鍥村唴绱鍑哄簱閲�"};//3.8鎸囧畾鏃堕棿鑼冨洿鍐呯疮璁″嚭搴撻噺
+ String[] getSevenArrivalStatusAndDetails = new String[]{"/tms/zhyt/getSevenArrivalStatusAndDetails", "銆怲MS銆戣繎7鏃ュ埌璐ф儏鍐�(鍚槑缁�)"};//3.13杩�7鏃ュ埌璐ф儏鍐�(鍚槑缁�)
+ String[] getNotFinishOrderList = new String[]{"/tms/zhyt/getNotFinishOrderList", "銆怲MS銆戞湭瀹屾垚璁㈠崟"};//3.13鏈畬鎴愯鍗�
}
public enum TopStatusLevel {
@@ -55,7 +57,17 @@
this.chileIndexList = chileIndexList;
this.name = name;
}
-
+ public static String getNameByKey(Integer key ) {
+ if(key == null){
+ return null;
+ }
+ for (TopStatusLevel c : TopStatusLevel.values()) {
+ if (c.getKey() == key) {
+ return c.getName();
+ }
+ }
+ return null;
+ }
public int getKey() {
return key;
}
@@ -139,7 +151,10 @@
this.orderStatus = orderStatus;
this.parentIndex = parentIndex;
}
- public static Integer getParentIndexByStatus(int orderStatus) {
+ public static Integer getParentIndexByStatus(Integer orderStatus) {
+ if(orderStatus == null){
+ return null;
+ }
for (ChildStatusLevel c : ChildStatusLevel.values()) {
if (c.getOrderStatus() == orderStatus) {
return c.parentIndex;
--
Gitblit v1.9.3