From a43f9d75a9e0ba2720b3c438a0c5ece7be0eb110 Mon Sep 17 00:00:00 2001 From: k94314517 <8417338+k94314517@user.noreply.gitee.com> Date: 星期三, 28 五月 2025 18:23:45 +0800 Subject: [PATCH] git ch --- server/service/src/main/java/com/doumee/core/utils/Constants.java | 205 ++++++++++++++++++++++++++++++++++++++++----------- 1 files changed, 160 insertions(+), 45 deletions(-) diff --git a/server/service/src/main/java/com/doumee/core/utils/Constants.java b/server/service/src/main/java/com/doumee/core/utils/Constants.java index 0dc1009..fbc5eea 100644 --- a/server/service/src/main/java/com/doumee/core/utils/Constants.java +++ b/server/service/src/main/java/com/doumee/core/utils/Constants.java @@ -99,6 +99,7 @@ public static final String COMPANY_USER_APPLY ="COMPANY_USER_APPLY" ; public static final String INSURANCE ="INSURANCE" ; public static final String CONTRACT ="CONTRACT" ; + public static final String DISCUSS_PROBLEM_TYPE ="DISCUSS_PROBLEM_TYPE" ; public static final String SETTLE_FILE ="SETTLE_FILE" ; public static final String DU_FILE ="DU_FILE" ; @@ -194,6 +195,13 @@ return Constants.equalsInteger(model.getStatus(), UnionApplyStatus.FINISH.getKey())?"淇濋櫓鐢熸晥姝㈡湡":"棰勮鐢熸晥姝㈡湡"; } + } + + public static BigDecimal getBigDecimalNoNull(BigDecimal bigDecimal){ + if(Objects.isNull(bigDecimal)){ + return BigDecimal.ZERO; + } + return bigDecimal; } /** @@ -769,6 +777,8 @@ LP_FILE(32, "淇濋櫓鍏徃涓婁紶鐞嗚禂鏉愭枡涓�瑙堣〃", "淇濋櫓鍏徃涓婁紶鐞嗚禂鏉愭枡涓�瑙堣〃"), LP_OTHER_FILE(33, "鐞嗚禂鍏朵粬鏉愭枡", "鐞嗚禂鍏朵粬鏉愭枡"), LP_PAY_FILE(34, "鎵撴鍑瘉", "鎵撴鍑瘉"), + LP_DZBD_FILE(35, "鐢靛瓙淇濆崟", "鐢靛瓙淇濆崟"), + LP_SUPPLEMENT_FILE(36, "琛ュ厖鏉愭枡", "琛ュ厖鏉愭枡"), ; // 鎴愬憳鍙橀噺 @@ -1936,32 +1946,32 @@ public enum SettleClaimsStatus { //鐘舵�� 0鏆傚瓨涓� 1宸叉姤妗� 2寰呯珛妗� 3宸茬珛妗� 4绔嬫閫�鍥� 5寰呭彈鐞� 6鎷掔粷鍙楃悊 7鍟嗚寰呭鎵� // 8鍟嗚瀹℃壒鎷掔粷 9宸插彈鐞� 10寰呮牳璧� 11宸叉牳璧� 12宸茬‘璁ら噾棰� 13宸茬粨妗� 14宸叉挙妗� - WAIT_ACCEPTANCE(0, "鏆傚瓨涓�"), - RETURN_ACCEPTANCE(1, "宸叉姤妗�"), - DEAL_ING(2, "寰呯珛妗� 锛堝純鐢級"), - CONFIRM_INFORMATION(3, "宸茬珛妗�"), - FINISH_ACCEPTANCE(4, "绔嬫閫�鍥�"), - WAIT_DEAL(5, "寰呭彈鐞�"), - REJECT_DEAL(6, "鎷掔粷鍙楃悊"), - WAIT_DISCUSS_AUDIT(7, "寰呭晢璁鎵�"), - WAIT_DISCUSS_REJECT(8, "鍟嗚瀹℃壒鎷掔粷"), - ACCEPTANCE(9, "宸插彈鐞�"),//寰呯悊绠� - WAIT_AUDIT_COMPENSATION(10, "寰呮牳璧�"), - COMPENSATION(11, "宸叉牳璧�"), - CONFIRM_FEE(12, "宸茬‘璁ら噾棰�"), - CLOSE_CASE(13, "宸茬粨妗�"), - RETURN(14, "宸叉挙妗�"), + WAIT_ACCEPTANCE(0, "鏆傚瓨涓�",0), + RETURN_ACCEPTANCE(1, "宸叉姤妗�",1), + DEAL_ING(2, "寰呯珛妗�",0),//寮冪敤 + CONFIRM_INFORMATION(3, "宸茬珛妗�",2), + FINISH_ACCEPTANCE(4, "绔嬫閫�鍥�",2), + WAIT_DEAL(5, "寰呭彈鐞�",3),//寮冪敤 + REJECT_DEAL(6, "鎷掔粷鍙楃悊",3), + WAIT_DISCUSS_AUDIT(7, "寰呭晢璁鎵�",3), + WAIT_DISCUSS_REJECT(8, "鍟嗚瀹℃壒鎷掔粷",3), + ACCEPTANCE(9, "宸插彈鐞�",3),//寰呯悊绠� + WAIT_AUDIT_COMPENSATION(10, "寰呮牳璧�",4), + COMPENSATION(11, "宸叉牳璧�",5), + CONFIRM_FEE(12, "宸茬‘璁ら噾棰�",5), + CLOSE_CASE(13, "宸茬粨妗�",6), + RETURN(14, "宸叉挙妗�",7), ; // 鎴愬憳鍙橀噺 private String name;//涓氬姟鎻忚堪 private int key;//涓氬姟鐘舵�� - private int companyParentKey;//浼佷笟涓绘祦绋� - private int platformParentKey;//骞冲彴涓绘祦绋� + private int parentKey;//涓绘祦绋� 1=鎶ユ 2=绔嬫 3=鍙楃悊 4=鐞嗙畻 5=鏍歌禂 6=缁撴/宸叉挙妗� // 鏋勯�犳柟娉� - SettleClaimsStatus(int key, String name) { + SettleClaimsStatus(int key, String name,int parentKey) { this.name = name; this.key = key; + this.parentKey = parentKey; } // 鏅�氭柟娉� public static String getName(int index) { @@ -1988,15 +1998,21 @@ public void setKey(int key) { this.key = key; } + + public int getParentKey() { + return parentKey; + } + + public void setParentKey(int parentKey) { + this.parentKey = parentKey; + } } - - public enum SettleClaimsLogType { UPLOAD(0, "鎻愪氦鎶ユ","鎻愪氦鎰忚锛�${param}"), PLATFORM_RETURN(1, "骞冲彴閫�鍥�","鎻愪氦鎰忚锛�${param}"), PLATFORM_CONFIRM_INFORMATION(2, "骞冲彴纭璧勬枡",""), - PLATFORM_FINISH(3, "缁撴","鎻愪氦鎰忚锛�${param}"), + PLATFORM_FINISH(3, "宸茬粨妗�","鎻愪氦鎰忚锛�${param}"), UPDATE_DATA(4, "淇敼淇℃伅","鎻愪氦鎰忚锛�${param}"), SUPPLEMENT(5, "琛ュ厖璇存槑","鎻愪氦鎰忚锛�${param}"), PLATFORM_LP_DEAL(6, "骞冲彴鐞嗚禂澶勭悊","宸插湪骞冲彴瀹屾垚鐞嗚禂"), @@ -2018,6 +2034,8 @@ PLATFORM_UPD_FEE(22, "鏍歌禂-淇敼閲戦",""), CONFIRM_FEE(22, "鏍歌禂-瀹㈡埛纭閲戦","宸茬‘璁ら噾棰�"), UPD_CASE_TYPE(23, "鍙楃悊-纭妗堜欢绫诲瀷","宸茬‘璁ゆ浠剁被鍨�"), + UPD_HURT_TYPE(24, "淇敼浼ゆ畫绫诲瀷淇℃伅","鏄惁浼ゆ畫淇敼涓衡�渰param}鈥�"), + UPD_RECEIVE_INFO(25, "鏀舵淇℃伅鍙樻洿","淇敼鏀舵淇℃伅"), ; // 鎴愬憳鍙橀噺 private String name; @@ -2033,7 +2051,7 @@ // 鏅�氭柟娉� public static String getName(int index) { - for (ApplyLogType c : ApplyLogType.values()) { + for (SettleClaimsLogType c : SettleClaimsLogType.values()) { if (c.getKey() == index) { return c.name; } @@ -2041,7 +2059,7 @@ return null; } public static String getInfo(int index) { - for (ApplyLogType c : ApplyLogType.values()) { + for (SettleClaimsLogType c : SettleClaimsLogType.values()) { if (c.getKey() == index) { return c.info; } @@ -2073,6 +2091,95 @@ public void setInfo(String info) { this.info = info; } + } + + + public enum SettleClaimsLogParentStatus { + BA(1, "鎶ユ","宸叉姤妗�","宸叉姤妗�"), + LA(2, "绔嬫","宸茬珛妗�","寰呯珛妗�"), + SL(3, "鍙楃悊","宸插彈鐞�","寰呭彈鐞�"), + LS(4, "鐞嗙畻","宸茬悊绠�","寰呯悊绠�"), + HP(5, "鏍歌禂","宸叉牳璧�","寰呮牳璧�"), + JA(6, "缁撴","宸茬粨妗�","寰呯粨妗�"), + ; + // 鎴愬憳鍙橀噺 + private String name; + private String info; + private String waitInfo; + private int key; + + // 鏋勯�犳柟娉� + SettleClaimsLogParentStatus(int key, String name,String info,String waitInfo) { + this.name = name; + this.info = info; + this.key = key; + this.waitInfo = waitInfo; + } + + // 鏅�氭柟娉� + public static String getName(int index) { + for (SettleClaimsLogParentStatus c : SettleClaimsLogParentStatus.values()) { + if (c.getKey() == index) { + return c.name; + } + } + return null; + } + + + // 鏅�氭柟娉� + public static SettleClaimsLogParentStatus getAll(int index) { + for (SettleClaimsLogParentStatus c : SettleClaimsLogParentStatus.values()) { + if (c.getKey() == index) { + return c; + } + } + return null; + } + + public static String getInfo(int index) { + for (SettleClaimsLogParentStatus c : SettleClaimsLogParentStatus.values()) { + if (c.getKey() == index) { + return c.info; + } + } + return null; + } + + // get set 鏂规硶 + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public int getKey() { + return key; + } + + public void setKey(int key) { + this.key = key; + } + + public String getInfo() { + return info; + } + + public void setInfo(String info) { + this.info = info; + } + + + public String getWaitInfo() { + return waitInfo; + } + + public void setWaitInfo(String waitInfo) { + this.waitInfo = waitInfo; + } + } @@ -2641,28 +2748,36 @@ * 璧斾粯椤� */ public enum compensation{ - YL_COMPENSATION(0, "鍖荤枟鐞嗚禂",1), - WG_COMPENSATION(1, "璇伐鐞嗚禂",1), - SC_COMPENSATION(2, "浼ゆ畫鐞嗚禂",1), - SW_COMPENSATION(3, "姝讳骸鐞嗚禂",1), - HSF_FEE(4, "浼欓璐�",2), - XY_FEE(5, "缁尰璐�",2), - YY_FEE(6, "钀ュ吇璐�",2), - HL_FEE(7, "鎶ょ悊璐�",2), - ZDJB_FEE(8, "閲嶅ぇ鐤剧梾璧斿伩閲�",2), - TB_FEE(9, "鐗瑰埆璐圭敤",2), - ZS_FEE(10, "浣忓璐�",2), - JT_FEE(11, "娲ヨ创",2), - CJ_FEE(12, "娈嬬柧璧斿伩閲�",2), - BFYR_FEE(13, "琚姎鍏讳汉鐢熸椿璐�",2), - SCF_FEE(14, "涓ц懍璐�",2), - JSFXJ_FEE(15, "绮剧鎶氭仱閲�",2), - JD_FEE(16, "閴村畾璐�",2), - SS_FEE(17, "璇夎璐�",2), - LS_FEE(18, "寰嬪笀璐�",2), - TRAFFIC_FEE(19, "浜ら�氳垂",2), - CJQJ_FEE(20, "娈嬬柧鍣ㄥ叿璐�",2), - QT_FEE(21, "鍏朵粬璐圭敤",2), + YL_COMPENSATION(0, "鍖荤枟鐞嗚禂",0), + WG_COMPENSATION(1, "璇伐鐞嗚禂",0), + SC_COMPENSATION(2, "浼ゆ畫鐞嗚禂",0), + SW_COMPENSATION(3, "姝讳骸鐞嗚禂",0), + HSF_FEE(4, "浼欓璐�",1), + XY_FEE(5, "缁尰璐�",1), + YY_FEE(6, "钀ュ吇璐�",1), + HL_FEE(7, "鎶ょ悊璐�",1), + ZDJB_FEE(8, "閲嶅ぇ鐤剧梾璧斿伩閲�",1), + TB_FEE(9, "鐗瑰埆璐圭敤",1), + ZS_FEE(10, "浣忓璐�",1), + JT_FEE(11, "娲ヨ创",1), + CJ_FEE(12, "娈嬬柧璧斿伩閲�",1), + BFYR_FEE(13, "琚姎鍏讳汉鐢熸椿璐�",1), + SCF_FEE(14, "涓ц懍璐�",1), + JSFXJ_FEE(15, "绮剧鎶氭仱閲�",1), + JD_FEE(16, "閴村畾璐�",1), + SS_FEE(17, "璇夎璐�",1), + LS_FEE(18, "寰嬪笀璐�",1), + TRAFFIC_FEE(19, "浜ら�氳垂",1), + CJQJ_FEE(20, "娈嬬柧鍣ㄥ叿璐�",1), + QT_FEE(21, "鍏朵粬璐圭敤",1), + ZFPJEYPF_FEE(22, "鎬诲彂绁ㄩ噾棰濊嵂鍝佽垂",2), + ZL_FEE(23, "璇婄枟璐�",2), + CL_FEE(24, "鏉愭枡璐�",2), + ZKJJE_FEE(25, "鎬绘墸鍑忛噾棰�",2), + BFZF_FEE(26, "閮ㄥ垎鑷垂",2), + QZF_FEE(27, "鍏ㄨ嚜璐归噾棰�",2), + BHL_FEE(28, "涓嶅悎鐞嗚垂鐢�",2), + DSFGF_FEE(29, "绗笁鏂圭粰浠樿垂鐢�",2), ; // 鎴愬憳鍙橀噺 private String name; -- Gitblit v1.9.3