From 4f2a2b480f1d36782c315881bad50066a52e71aa Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期日, 04 二月 2024 14:11:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/service/src/main/java/com/doumee/core/utils/Constants.java | 189 +++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 182 insertions(+), 7 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 14fe22d..09ba80d 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
@@ -635,8 +635,8 @@
AUDIT_UN_PASS(2, "娲鹃仯鍗曚綅涓嶉�氳繃"),
EDIT_UNIT(3, "淇敼娲鹃仯鍗曚綅淇℃伅"),
ADD_WORK_TYPE(4, "鎻愪氦娣诲姞宸ョ"),
- WORK_TYPE_AUDIT_PASS(5, "娣诲姞宸ョ瀹℃壒閫氳繃"),
- WORK_TYPE_AUDIT_UN_PASS(6, "娣诲姞宸ョ瀹℃壒涓嶉�氳繃"),
+ WORK_TYPE_AUDIT_PASS(5, "娣诲姞宸ョ瀹℃牳閫氳繃"),
+ WORK_TYPE_AUDIT_UN_PASS(6, "娣诲姞宸ョ瀹℃牳涓嶉�氳繃"),
;
// 鎴愬憳鍙橀噺
private String name;
@@ -678,7 +678,7 @@
}
public enum ApplyCollectStatus {
- DSP(0, "寰呭鎵�"),
+ DSP(0, "寰呭鏍�"),
DCD(1, "寰呭嚭鍗�"),
BZZ(2, "淇濋殰涓�"),
YGQ(3, "宸茶繃鏈�"),
@@ -822,7 +822,7 @@
COMPANY_BACK_APPLY_WAIT_SIGNATURE(7, "浼佷笟鐢宠閫�鍥�(寰呯绔�)","鎻愪氦鎰忚锛�${param}",5),
COMPANY_BACK_APPLY_SIGNATURE(8, "浼佷笟鐢宠閫�鍥�(宸茬绔�)","鎻愪氦鎰忚锛�${param}",5),
CLOSE(9, "璁㈠崟鍏抽棴","",6),
- PLATFORM_CHECK_PASS(10,"骞冲彴鎶曚繚瀹℃牳閫氳繃","鎻愪氦鎰忚锛�${param}",1),
+ PLATFORM_CHECK_PASS(10,"骞冲彴鎶曚繚瀹℃牳閫氳繃","鎻愪氦鎰忚锛�${param}",0),
;
// 鎴愬憳鍙橀噺
private String name;
@@ -910,6 +910,181 @@
}
}
+
+ public enum NoticeObjectType {
+ INSURANCE_APPLY(0, "鎶曚繚鐢宠","淇濋櫓鏂规"),
+ APPLY_CHANGE(1, "鍔犲噺淇濈敵璇�","淇濋櫓鏂规"),
+ CHANGE_FACTORY(2, "鍛樺伐鎹㈠巶鐢宠","淇濋櫓鏂规"),
+ DISPATCH_UNIT(3, "娲鹃仯鍗曚綅鐢宠","娲鹃仯鍗曚綅"),
+ TAXES(4, "寮�绁ㄧ敵璇�","寮�绁ㄩ噾棰�"),
+ SETTLE_CLAIMS(5, "鎶ユ鐞嗚禂","鎶ユ浜�")
+ ;
+ // 鎴愬憳鍙橀噺
+ private int key;
+ private String name;
+ private String info;
+
+ // 鏋勯�犳柟娉�
+ NoticeObjectType(int key, String name,String info) {
+ this.name = name;
+ this.key = key;
+ this.info = info;
+ }
+
+ // 鏅�氭柟娉�
+ public static String getName(int index) {
+ for (NoticeObjectType c : NoticeObjectType.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 String getInfo() {
+ return info;
+ }
+
+ public void setInfo(String info) {
+ this.info = info;
+ }
+
+ }
+
+
+ public enum NoticeType {
+
+ ZERO(0, "寰呭鏍�","","","寰呭鏍�","宸茬敵璇�","寰呭彈鐞�"),
+ ONE(1, "浼佷笟寰呯缃�","","","宸ョ寰呭鏍�","","瀹屾垚鍙楃悊"),
+ TWO(2, "寰呭嚭鍗�","寰呭鏍�","寰呭鏍�","","",""),
+ THREE(3, "鐢宠閫�鍥�","鐢宠閫�鍥�","鐢宠閫�鍥�","","",""),
+ FOUR(4, "宸查��鍥�","宸查��鍥�","宸查��鍥�","","",""),
+ FIVE(5, "鐢宠椹冲洖","鐢宠椹冲洖","鐢宠椹冲洖","","","")
+ ;
+
+ // 鎴愬憳鍙橀噺
+ private int status;
+ private String insuranceApplyDetail;
+ private String applyChangeDetail;
+ private String changeFactoryDetail;
+ private String dispatchUnitDetail;
+ private String taxesDetail;
+ private String settleClaimsDetail;
+
+ // 鏋勯�犳柟娉�
+ NoticeType(int status, String insuranceApplyDetail,String applyChangeDetail
+ , String changeFactoryDetail,String dispatchUnitDetail
+ , String taxesDetail,String settleClaimsDetail) {
+ this.status = status;
+ this.insuranceApplyDetail = insuranceApplyDetail;
+ this.applyChangeDetail = applyChangeDetail;
+ this.changeFactoryDetail = changeFactoryDetail;
+ this.dispatchUnitDetail = dispatchUnitDetail;
+ this.taxesDetail = taxesDetail;
+ this.settleClaimsDetail = settleClaimsDetail;
+ }
+
+ // 鏅�氭柟娉�
+ public static String getDetail(int status,int type) {
+ for (NoticeType c : NoticeType.values()) {
+ if (c.getStatus() == status) {
+ if(type==NoticeObjectType.INSURANCE_APPLY.getKey() ){
+ return c.getInsuranceApplyDetail();
+ }else if(type == NoticeObjectType.APPLY_CHANGE.getKey()){
+ return c.getApplyChangeDetail();
+ }else if(type == NoticeObjectType.CHANGE_FACTORY.getKey()){
+ return c.getChangeFactoryDetail();
+ }else if(type == NoticeObjectType.DISPATCH_UNIT.getKey()){
+ return c.getDispatchUnitDetail();
+ }else if(type == NoticeObjectType.TAXES.getKey()){
+ return c.getTaxesDetail();
+ }else if(type == NoticeObjectType.SETTLE_CLAIMS.getKey()){
+ return c.getSettleClaimsDetail();
+ }
+ }
+ }
+ return null;
+ }
+
+ // get set 鏂规硶
+ public int getStatus() {
+ return status;
+ }
+
+ public void setStatus(int status) {
+ this.status = status;
+ }
+
+ public String getInsuranceApplyDetail() {
+ return insuranceApplyDetail;
+ }
+
+ public void setInsuranceApplyDetail(String name) {
+ this.insuranceApplyDetail = insuranceApplyDetail;
+ }
+
+ public String getApplyChangeDetail() {
+ return applyChangeDetail;
+ }
+
+ public void setApplyChangeDetail(String info) {
+ this.applyChangeDetail = applyChangeDetail;
+ }
+
+ public String getChangeFactoryDetail() {
+ return changeFactoryDetail;
+ }
+
+ public void setChangeFactoryDetail(String info) {
+ this.changeFactoryDetail = changeFactoryDetail;
+ }
+
+ public String getDispatchUnitDetail() {
+ return dispatchUnitDetail;
+ }
+
+ public void setDispatchUnitDetail(String info) {
+ this.dispatchUnitDetail = dispatchUnitDetail;
+ }
+
+ public String getTaxesDetail() {
+ return taxesDetail;
+ }
+
+ public void setTaxesDetail(String info) {
+ this.taxesDetail = taxesDetail;
+ }
+
+ public String getSettleClaimsDetail() {
+ return settleClaimsDetail;
+ }
+
+ public void setSettleClaimsDetail(String info) {
+ this.settleClaimsDetail = settleClaimsDetail;
+ }
+
+
+ }
+
+
public static BigDecimal countDetailFee(Solutions solutions,Date startDate, Date endDate){
//鏌ヨ淇濋櫓瀹為檯鍛ㄦ湡
Integer cycle = DateUtil.calculateBetween(endDate,startDate,solutions.getTimeUnit());
@@ -932,7 +1107,7 @@
public enum ApplyChangeStatus {
UPLOAD(0, "鎻愪氦鍔犲噺淇�/鎹㈠巶鐢宠"),
SIGNATURE(1, "宸茬绔�"),
- APPROVE(2, "宸蹭笂浼犲鎵�"),
+ APPROVE(2, "宸蹭笂浼犲鏍�"),
RETURN_APPLY_UPLOAD(3, "鍙戣捣閫�鍥炵敵璇�(寰呭鏍�)"),
RETURN_APPLY_SIGNATURE(4, "鍙戣捣閫�鍥炵敵璇凤紙宸茬绔狅級"),
PLATFORM_AGREE(5, "骞冲彴鍚屾剰锛堝凡閫�鍥烇級"),
@@ -1102,8 +1277,8 @@
public enum ApplyChangeLogStatus {
UPLOAD(0, "鍙戣捣鐢宠",""),
RETURN_APPLY(3, "鍙戣捣閫�鍥炵敵璇�","鎻愪氦鎰忚锛�${param}"),
- PLATFORM_AGREE(4, "骞冲彴瀹℃壒閫氳繃" ,"鎻愪氦鎰忚锛�${param}"),
- PLATFORM_UN_AGREE(0, "瀹℃壒椹冲洖","鎻愪氦鎰忚锛�${param}"),
+ PLATFORM_AGREE(4, "骞冲彴瀹℃牳閫氳繃" ,"鎻愪氦鎰忚锛�${param}"),
+ PLATFORM_UN_AGREE(0, "瀹℃牳椹冲洖","鎻愪氦鎰忚锛�${param}"),
CLOSE(5, "鍏抽棴",""),
;
// 鎴愬憳鍙橀噺
--
Gitblit v1.9.3