From 81d7f91fa38e74cab052eb4413bd3e12686935a4 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期一, 26 五月 2025 14:07:34 +0800
Subject: [PATCH] git ch
---
server/service/src/main/java/com/doumee/core/utils/Constants.java | 58 +++++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 41 insertions(+), 17 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 a589686..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, "琛ュ厖鏉愭枡", "琛ュ厖鏉愭枡"),
;
// 鎴愬憳鍙橀噺
@@ -1938,19 +1948,19 @@
// 8鍟嗚瀹℃壒鎷掔粷 9宸插彈鐞� 10寰呮牳璧� 11宸叉牳璧� 12宸茬‘璁ら噾棰� 13宸茬粨妗� 14宸叉挙妗�
WAIT_ACCEPTANCE(0, "鏆傚瓨涓�",0),
RETURN_ACCEPTANCE(1, "宸叉姤妗�",1),
- DEAL_ING(2, "寰呯珛妗� 锛堝純鐢級",0),
- CONFIRM_INFORMATION(3, "宸茬珛妗�",1),
- FINISH_ACCEPTANCE(4, "绔嬫閫�鍥�",1),
- WAIT_DEAL(5, "寰呭彈鐞�",2),
- REJECT_DEAL(6, "鎷掔粷鍙楃悊",2),
- WAIT_DISCUSS_AUDIT(7, "寰呭晢璁鎵�",2),
+ 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, "宸叉挙妗�",6),
+ RETURN(14, "宸叉挙妗�",7),
;
// 鎴愬憳鍙橀噺
private String name;//涓氬姟鎻忚堪
@@ -2002,7 +2012,7 @@
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, "骞冲彴鐞嗚禂澶勭悊","宸插湪骞冲彴瀹屾垚鐞嗚禂"),
@@ -2024,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;
@@ -2039,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;
}
@@ -2047,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;
}
@@ -2083,23 +2095,25 @@
public enum SettleClaimsLogParentStatus {
- BA(1, "鎶ユ","宸叉姤妗�"),
- LA(2, "绔嬫","宸茬珛妗�"),
- SL(3, "鍙楃悊","宸插彈鐞�"),
- LS(4, "鐞嗙畻","宸茬悊绠�"),
- HP(5, "鏍歌禂","宸叉牳璧�"),
- JA(6, "缁撴","宸茬粨妗�"),
+ 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) {
+ SettleClaimsLogParentStatus(int key, String name,String info,String waitInfo) {
this.name = name;
this.info = info;
this.key = key;
+ this.waitInfo = waitInfo;
}
// 鏅�氭柟娉�
@@ -2156,6 +2170,16 @@
public void setInfo(String info) {
this.info = info;
}
+
+
+ public String getWaitInfo() {
+ return waitInfo;
+ }
+
+ public void setWaitInfo(String waitInfo) {
+ this.waitInfo = waitInfo;
+ }
+
}
--
Gitblit v1.9.3