From 3f44e29a7e2620bcc498f9d4bf7c454b00225ee2 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 23 一月 2024 10:20:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/service/src/main/java/com/doumee/core/utils/Constants.java | 234 +++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 207 insertions(+), 27 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 d25517c..200e527 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
@@ -70,6 +70,8 @@
public static final String COMPANY_FILE ="COMPANY_FILE" ;
public static final String SMS_COMNAME = "SMS_COMNAME";
public static final String TAXES_FILE = "TAXES_FILE";
+ public static final String APPLY_FILE ="APPLY_FILE" ;
+ public static final String SETTLE_FILE ="SETTLE_FILE" ;
/**
* 浼佷笟鏁版嵁鏉ユ簮 0骞冲彴娉ㄥ唽 1鍚庡彴瀵煎叆
@@ -97,6 +99,15 @@
// d = d.setScale(2, BigDecimal.ROUND_HALF_UP);
return d;
}
+ public static BigDecimal formatBigdecimal2Float(BigDecimal d) {
+ if (d == null) {
+ d = new BigDecimal(0.0);
+ }
+ //淇濈暀涓や綅灏忔暟涓斿洓鑸嶄簲鍏�
+ d = d.setScale(2, BigDecimal.ROUND_HALF_UP);
+ return d;
+ }
+
public static BigDecimal formatBigdecimal4Float(BigDecimal d) {
if (d == null) {
d = new BigDecimal(0.0);
@@ -609,24 +620,37 @@
public enum ApplyLogType {
- UPLOAD(0, "鎻愪氦鎶曚繚鐢宠"),
- PLATFORM_RETURN(1, "骞冲彴閫�鍥炰繚鍗�"),
- WAIT_SIGNATURE(2, "宸蹭笂浼犱唬绛剧敵璇疯〃寰呬紒涓氱绔�"),
- SIGNATURE(3, "宸茬绔犲緟涓婁紶淇濋櫓鍗�"),
- FAIL_RETURN(4, "淇濆崟鍑哄叿澶辫触閫�鍥�"),
- UPLOAD_INSURANCE(5, "宸蹭笂浼犱繚鍗�"),
- COMPANY_APPLY_RETURN(6, "浼佷笟鐢宠閫�鍥�"),
- COMPANY_APPLY_CLOSE(7, "浼佷笟鍏抽棴鐢宠"),
- PLATFORM_AGREE(8, "骞冲彴鍚屾剰浼佷笟閫�鍥炵敵璇�"),
- PLATFORM_UN_AGREE(9, "骞冲彴鎷掔粷浼佷笟閫�鍥炵敵璇�"),
+ UPLOAD(0, "鎻愪氦鎶曚繚","鎻愪氦鎰忚锛�${param}"),
+ PLATFORM_RETURN(1, "閫�鍥炴姇淇�","鎻愪氦鎰忚锛�${param}"),
+ WAIT_SIGNATURE(2, "涓婁紶鎶曚繚鍗�","鎻愪氦鎰忚锛�${param}"),
+ SIGNATURE(3, "浼佷笟绛剧珷",""),
+ FAIL_RETURN(4, "淇濆崟鍑哄叿澶辫触閫�鍥�","鎻愪氦鎰忚锛�${param}"),
+ UPLOAD_INSURANCE(5, "淇濆崟瀹屾垚","淇濋櫓鐢熸晥璧锋湡锛�${param1}鍙樻洿涓�${param2}"),
+ COMPANY_APPLY_RETURN(6, "鐢宠閫�鍥�","鎻愪氦鎰忚锛�${param}"),
+ COMPANY_APPLY_CLOSE(7, "鍏抽棴鐢宠",""),
+ PLATFORM_AGREE_BACK(8, "鍚屾剰閫�鍥炵敵璇�",""),
+ PLATFORM_UN_AGREE_BACK(9, "椹冲洖閫�鍥炵敵璇�","鎻愪氦鎰忚锛�${param}"),
+ COMPANY_EDIT(10, "淇濆崟淇敼","鎻愪氦鎰忚锛�${param1}\n${param2}"),
+ PLATFORM_CHECK_PASS(11, "鎶曚繚瀹℃牳閫氳繃",""),
+ CA_PLATFORM_CHECK_PASS_NO(12, "閫�鍥炴姇淇�","鎻愪氦鎰忚锛�${param}"),
+ CA_PLATFORM_AGREE_BACK_APPLY(13, "鍚屾剰閫�鍥炵敵璇�","鎻愪氦鎰忚锛�${param}"),
+ CA_PLATFORM_CHECK_APPROVE(14, "鎵瑰崟瀹屾垚",""),
+ CA_PLATFORM_CHECK_SIGNATURE(15, "浼佷笟绛剧珷",""),
+ CA_COMPANY_EDIT(16, "鎵瑰崟淇敼","鎻愪氦鎰忚锛�${param1}\n${param2}"),
+ CA_COMPANY_COMMIT(17, "鎻愪氦鎶曚繚","鎻愪氦鎰忚锛�${param}"),
+ CA_COMPANY_BACK_APPLY(18, "鐢宠閫�鍥�","鎻愪氦鎰忚锛�${param}"),
+ CA_COMPANY_CLOSE(19, "鍏抽棴璁㈠崟",""),
+ CA_PALTFORM_REFUSE_APPLY(20, "椹冲洖閫�鍥炵敵璇�",""),
;
// 鎴愬憳鍙橀噺
private String name;
+ private String info;
private int key;
// 鏋勯�犳柟娉�
- ApplyLogType(int key, String name) {
+ ApplyLogType(int key, String name,String info) {
this.name = name;
+ this.info = info;
this.key = key;
}
@@ -635,6 +659,14 @@
for (ApplyLogType c : ApplyLogType.values()) {
if (c.getKey() == index) {
return c.name;
+ }
+ }
+ return null;
+ }
+ public static String getInfo(int index) {
+ for (ApplyLogType c : ApplyLogType.values()) {
+ if (c.getKey() == index) {
+ return c.info;
}
}
return null;
@@ -657,34 +689,53 @@
this.key = key;
}
+ public String getInfo() {
+ return info;
+ }
+
+ public void setInfo(String info) {
+ this.info = info;
+ }
}
public enum InsuranceApplyStatus {
- UPLOAD(0, "鎻愪氦鎶曚繚鐢宠"),
- PLATFORM_RETURN(1, "骞冲彴閫�鍥炰繚鍗�"),
- WAIT_SIGNATURE(2, "宸蹭笂浼犱唬绛剧敵璇疯〃寰呬紒涓氱绔�"),
- SIGNATURE(3, "宸茬绔犲緟涓婁紶淇濋櫓鍗�"),
- FAIL_RETURN(4, "淇濆崟鍑哄叿澶辫触閫�鍥�"),
- UPLOAD_INSURANCE(5, "宸蹭笂浼犱繚鍗�"),
- COMPANY_APPLY_RETURN(6, "浼佷笟鐢宠閫�鍥�"),
- PLATFORM_AGREE(7, "骞冲彴鍚屾剰閫�鍥�"),
- CLOSE(8, "璁㈠崟鍏抽棴"),
+ UPLOAD(0, "鎻愪氦鎶曚繚",""),
+ PLATFORM_RETURN(1, "瀹℃牳涓嶉�氳繃","鎻愪氦鎰忚锛�${param}"),
+ WAIT_SIGNATURE(2, "宸蹭笂浼犱唬绛剧敵璇疯〃寰呬紒涓氱绔�",""),
+ SIGNATURE(3, "宸茬绔犲緟涓婁紶淇濋櫓鍗�",""),
+ FAIL_RETURN(4, "淇濆崟鍑哄叿澶辫触閫�鍥�",""),
+ UPLOAD_INSURANCE(5, "淇濆崟瀹屾垚","淇濋櫓鐢熸晥璧锋湡锛�${param}鍙樻洿涓�${param1}"),
+ COMPANY_BACK_APPLY_UPLOAD(6, "浼佷笟鐢宠閫�鍥�(鎻愪氦鎶曚繚)","鎻愪氦鎰忚锛�${param}"),
+ COMPANY_BACK_APPLY_WAIT_SIGNATURE(7, "浼佷笟鐢宠閫�鍥�(寰呯绔�)","鎻愪氦鎰忚锛�${param}"),
+ COMPANY_BACK_APPLY_SIGNATURE(8, "浼佷笟鐢宠閫�鍥�(宸茬绔�)","鎻愪氦鎰忚锛�${param}"),
+ CLOSE(9, "璁㈠崟鍏抽棴",""),
+ PLATFORM_CHECK_PASS(10,"骞冲彴鎶曚繚瀹℃牳閫氳繃",""),
;
// 鎴愬憳鍙橀噺
private String name;
+ private String info;
private int key;
// 鏋勯�犳柟娉�
- InsuranceApplyStatus(int key, String name) {
+ InsuranceApplyStatus(int key, String name,String info) {
this.name = name;
this.key = key;
+ this.info = info;
}
// 鏅�氭柟娉�
public static String getName(int index) {
- for (ApplyLogType c : ApplyLogType.values()) {
+ for (InsuranceApplyStatus c : InsuranceApplyStatus.values()) {
if (c.getKey() == index) {
return c.name;
+ }
+ }
+ return null;
+ }
+ public static String getInfo(int index) {
+ for (InsuranceApplyStatus c : InsuranceApplyStatus.values()) {
+ if (c.getKey() == index) {
+ return c.info;
}
}
return null;
@@ -707,11 +758,18 @@
this.key = key;
}
+ public String getInfo() {
+ return info;
+ }
+
+ public void setInfo(String info) {
+ this.info = info;
+ }
}
public static BigDecimal countDetailFee(Solutions solutions,Date startDate, Date endDate){
//鏌ヨ淇濋櫓瀹為檯鍛ㄦ湡
- Integer cycle = DateUtil.calculateBetween(endDate,startDate,solutions.getDataType());
+ Integer cycle = DateUtil.calculateBetween(endDate,startDate,solutions.getTimeUnit());
if(cycle==-1){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"鏃ユ湡淇℃伅閿欒!");
}
@@ -723,9 +781,12 @@
UPLOAD(0, "鎻愪氦鍔犲噺淇�/鎹㈠巶鐢宠"),
SIGNATURE(1, "宸茬绔�"),
APPROVE(2, "宸蹭笂浼犲鎵�"),
- RETURN_APPLY(3, "鍙戣捣閫�鍥炵敵璇�"),
- PLATFORM_AGREE(4, "骞冲彴鍚屾剰锛堝凡閫�鍥烇級"),
- CLOSE(5, "宸插叧闂�"),
+ RETURN_APPLY_UPLOAD(3, "鍙戣捣閫�鍥炵敵璇�(寰呭鏍�)"),
+ RETURN_APPLY_SIGNATURE(4, "鍙戣捣閫�鍥炵敵璇凤紙宸茬绔狅級"),
+ PLATFORM_AGREE(5, "骞冲彴鍚屾剰锛堝凡閫�鍥烇級"),
+ CLOSE(6, "宸插叧闂�"),
+ PALTFORM_CHECK_PASS(7, "瀹℃牳閫氳繃"),
+ PALTFORM_CHECK_PASS_NO(8, "瀹℃牳涓嶉�氳繃"),
;
// 鎴愬憳鍙橀噺
private String name;
@@ -739,7 +800,7 @@
// 鏅�氭柟娉�
public static String getName(int index) {
- for (ApplyLogType c : ApplyLogType.values()) {
+ for (InsuranceApplyStatus c : InsuranceApplyStatus.values()) {
if (c.getKey() == index) {
return c.name;
}
@@ -766,6 +827,125 @@
}
+
+
+ public enum SettleClaimsStatus {
+ WAIT_ACCEPTANCE(0, "寰呭彈鐞�"),
+ RETURN_ACCEPTANCE(1, "閫�鍥炲彈鐞�"),
+ CONFIRM_INFORMATION(2, "纭璧勬枡"),
+ FINISH_ACCEPTANCE(3, "瀹屾垚鍙楃悊"),
+ ;
+ // 鎴愬憳鍙橀噺
+ private String name;
+ private int key;
+
+ // 鏋勯�犳柟娉�
+ SettleClaimsStatus(int key, String name) {
+ this.name = name;
+ this.key = key;
+ }
+ // 鏅�氭柟娉�
+ public static String getName(int index) {
+ for (SettleClaimsStatus c : SettleClaimsStatus.values()) {
+ if (c.getKey() == index) {
+ return c.name;
+ }
+ }
+ 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 enum SettleClaimsLogType {
+ UPLOAD(0, "鎻愪氦鎶ユ","鎻愪氦鎰忚锛�${param}"),
+ PLATFORM_RETURN(1, "骞冲彴閫�鍥�","鎻愪氦鎰忚锛�${param}"),
+ CONFIRM_INFORMATION(2, "骞冲彴纭璧勬枡","鎻愪氦鎰忚锛�${param}"),
+ PLATFORM_FINISH(3, "骞冲彴瀹屾垚鍙楃悊","鎻愪氦鎰忚锛�${param}"),
+ UPDATE_DATA(4, "淇敼淇℃伅","鎻愪氦鎰忚锛�${param}"),
+ SUPPLEMENT(5, "琛ュ厖璇存槑","鎻愪氦鎰忚锛�${param}"),
+ COMPANY_APPLY_RETURN(6, "骞冲彴鐞嗚禂澶勭悊","鎻愪氦鎰忚锛�${param}"),
+ COMPANY_APPLY_CLOSE(7, "骞冲彴澶囨敞鏍囩",""),
+ PLATFORM_AGREE_BACK(8, "骞冲彴娣诲姞鎶ユ鍙�",""),
+ PLATFORM_UN_AGREE_BACK(9, "浼佷笟涓嬭浇璧勬枡",""),
+ COMPANY_EDIT(10, "骞冲彴涓嬭浇璧勬枡",""),
+ PLATFORM_CHECK_PASS(11, "骞冲彴涓婁紶璧勬枡",""),
+ ;
+ // 鎴愬憳鍙橀噺
+ private String name;
+ private String info;
+ private int key;
+
+ // 鏋勯�犳柟娉�
+ SettleClaimsLogType(int key, String name,String info) {
+ this.name = name;
+ this.info = info;
+ this.key = key;
+ }
+
+ // 鏅�氭柟娉�
+ public static String getName(int index) {
+ for (ApplyLogType c : ApplyLogType.values()) {
+ if (c.getKey() == index) {
+ return c.name;
+ }
+ }
+ return null;
+ }
+ public static String getInfo(int index) {
+ for (ApplyLogType c : ApplyLogType.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;
+ }
+ }
+
+
+
+
//3=閫�鍥炵敵璇凤紱4=骞冲彴瀹℃壒閫氳繃锛�0=瀹℃壒椹冲洖;5=骞冲彴瀹℃壒椹冲洖
public enum ApplyChangeLogStatus {
UPLOAD(0, "鍙戣捣鐢宠"),
--
Gitblit v1.9.3