From efcdc8c49b0452d9c7f192ab351da09bf8aafc80 Mon Sep 17 00:00:00 2001 From: liukangdong <898885815@qq.com> Date: 星期一, 27 五月 2024 18:34:58 +0800 Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit --- server/system_service/src/main/java/com/doumee/core/utils/Constants.java | 23 ++++++++++++++--------- 1 files changed, 14 insertions(+), 9 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 bdfaecf..9271ca9 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 @@ -386,15 +386,6 @@ return d; } - public static boolean equalsObject(Object a, Object b) { - if (a == null && b == null) { - return true; - } - if (a != null){ - return a.equals(b); - } - return false; - } public static boolean equalsInteger(Integer a, Integer b) { @@ -426,12 +417,26 @@ } +public interface approveObjectType{ + int unConstructionVisit = 0;//闈炴柦宸ヤ汉鍛樿瀹㈢敵璇� + int constructionVisit = 1;//宸ヤ汉鍛樿瀹㈢敵璇� + int visitReporting = 2;//璁垮鎶ュ + int cityUseCar = 3;//甯傚唴鐢ㄨ溅 + int unCityUseCar = 4;//甯傚鐢ㄨ溅 + int logisticsCarUse = 5;//鐗╂祦杞﹂绾� + +} + + + public interface approveStatus{ int wait = 0;//寰呭鎵� int auditIng = 1;//瀹℃壒涓� int pass = 2;//瀹℃壒閫氳繃 int unPass = 3;//瀹℃壒鏈�氳繃 int otherDeal = 4;//浠栦汉宸插鐞� + int cancel = 5;//宸插彇娑� + int otherUnPass = 6;//浠栦汉鎷掔粷 } /** -- Gitblit v1.9.3