From 02bc3bfe47e3d5311a0bb041c94e70a34b1ca73c Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期二, 09 四月 2024 09:03:01 +0800
Subject: [PATCH] git ch
---
server/service/src/main/java/com/doumee/core/utils/Constants.java | 371 +++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 320 insertions(+), 51 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 c6be2c9..ada7385 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
@@ -27,7 +27,8 @@
public static final int ZERO = 0 ;
public static final int ONE = 1 ;
public static final int TWO = 2 ;
- public static final int THREE = 3 ;
+ public static final int
+ THREE = 3 ;
public static final int SEVEN = 7 ;
public static final String ACCESS_ID="ACCESS_ID";
public static final String BUCKETNAME = "BUCKETNAME";
@@ -43,7 +44,9 @@
public static final String RANGE_SIZE = "RANGE_SIZE";
public static final String CATE_PARAM_OPEN = "_CATE_PARAM_OPEN";
public static final String OPEN_SYNC_SWITCH = "OPEN_SYNC_SWITCH";
-
+ public static final String WX_MIN_PROGRAM = "WX_MIN_PROGRAM";
+ public static final String WX_MIN_APPID = "WX_MIN_APPID";
+ public static final String WX_MIN_SECRET = "WX_MIN_SECRET";
public static final String SYSTEM ="SYSTEM";
public static final String GOODS_IMG_DIR ="GOODS_IMG_DIR";
@@ -82,6 +85,7 @@
public static final String SETTLE_FILE ="SETTLE_FILE" ;
public static final String DU_FILE ="DU_FILE" ;
public static final String SIGN_DONE_NOTIFY_URL = "SIGN_DONE_NOTIFY_URL";
+ public static final int FOUR = 4;
/**
* 浼佷笟鏁版嵁鏉ユ簮 0骞冲彴娉ㄥ唽 1鍚庡彴瀵煎叆
@@ -155,43 +159,60 @@
int birthYear = Integer.parseInt(idCard.substring(6, 10));
int birthMonth = Integer.parseInt(idCard.substring(10, 12));
int birthDay = Integer.parseInt(idCard.substring(12, 14));
+ try{
+ LocalDate birthDate = LocalDate.of(birthYear, birthMonth, birthDay);
+ LocalDate currentDate = LocalDate.now();
+ long age = ChronoUnit.YEARS.between(birthDate, currentDate);
+ return age;
+ }catch (Exception e){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"韬唤璇佸彿鐮侀敊璇細"+idCard);
+ }
- LocalDate birthDate = LocalDate.of(birthYear, birthMonth, birthDay);
- LocalDate currentDate = LocalDate.now();
- long age = ChronoUnit.YEARS.between(birthDate, currentDate);
- return age;
+
}
public static CountCyclePriceVO countPriceVO(Date startDate, Solutions solutions){
CountCyclePriceVO countCyclePriceVO = new CountCyclePriceVO();
if(solutions.getInsureCycleUnit().equals(Constants.ZERO)){
- countCyclePriceVO.setEndDate(DateUtil.afterDateByType(startDate,0,solutions.getInsureCycle()));
+ countCyclePriceVO.setEndDate(
+ DateUtil.getMontageDate(
+ DateUtil.afterDateByType(startDate,0,solutions.getInsureCycle()-1)
+ ,2)
+ );
}else if(solutions.getInsureCycleUnit().equals(Constants.TWO)){
+ //鑾峰彇褰撴湀澶╂暟
Integer monthDays = DateUtil.monthDays(startDate);
+ //鑾峰彇澶╂暟鍚庣殑鏃ユ湡
Date afterDate = DateUtil.afterDateByType(startDate,0,monthDays);
- countCyclePriceVO.setEndDate(DateUtil.afterDateByType(afterDate,0,-1));
+ //璧嬪�� 姣忔棩缁撴潫鏃跺垎绉�
+ countCyclePriceVO.setEndDate(DateUtil.getMontageDate(afterDate,3));
}else if(solutions.getInsureCycleUnit().equals(Constants.THREE)){
+ //鑾峰彇X骞村悗鏃ユ湡 澶氫簡涓�澶�
Date afterDate = DateUtil.afterDateByType(startDate,2,solutions.getInsureCycle());
- countCyclePriceVO.setEndDate(DateUtil.afterDateByType(afterDate,0,-1));
+ //璧嬪�� 姣忔棩缁撴潫鏃跺垎绉� 鐒跺悗鍑忓皯涓�澶�
+ countCyclePriceVO.setEndDate(DateUtil.getMontageDate(afterDate,3));
}
countCyclePriceVO.setCyclePrice(Constants.countDetailFee(solutions,countCyclePriceVO.getEndDate(),startDate));
return countCyclePriceVO;
}
public static Integer getSexByIdCard(String idCard){
+ if(StringUtils.isBlank(idCard)){
+ return 2;
+ }
Pattern pattern = Pattern.compile("\\d{17}[\\d|x]"); // 瀹氫箟韬唤璇佸彿鐮佹牸寮忕殑姝ｅ垯琛ㄨ揪寮�
Matcher matcher = pattern.matcher(idCard);
- Integer sex = 1;
+ Integer sex = 0;
if (matcher.matches()) {
int genderCode = Integer.parseInt(idCard.substring(16, 17)); // 浠庣17浣嶅紑濮嬫彁鍙栨�у埆缂栫爜锛堝鏁颁负鐢锋�э紝鍋舵暟涓哄コ鎬э級
if ((genderCode % 2 == 1) ) {
- sex = 1;
+ sex = 0;
} else {
- sex = 2;
+ sex = 1;
}
} else {
- sex = -1;
+ sex = 2;
}
return sex;
}
@@ -428,7 +449,15 @@
CA_APPLY_JIAJIAN_SIGN(13, "鍔犲噺淇濈敵璇风绔犳枃浠�", "鍔犲噺淇濈敵璇风绔犳枃浠�"),
CA_APPLY_CHANGEUNIT_SIGN(14, "鎹㈠巶鐢宠绛剧珷鏂囦欢", "鎹㈠巶鐢宠绛剧珷鏂囦欢"),
-
+ HBD_BD_APPLY_PDF(15, "鍚堝苟鍗�-淇濆崟鐢宠琛≒DF ", "鍚堝苟鍗�-淇濆崟鐢宠琛≒DF "),
+ HBD_BD_SIGNED_PDF(16, "鍚堝苟鍗�-绛剧讲鍚庝繚鍗曠敵璇疯〃PDF", "鍚堝苟鍗�-绛剧讲鍚庝繚鍗曠敵璇疯〃PDF"),
+ SOLUTIONS_CONFIRMATION_LATTER(18, "鎶曚繚鏂规纭涔�", "鎶曚繚鏂规纭涔�"),
+ MEMBER_LIST_LATTER(19, "濮旀墭淇� - 鎶曚繚浜哄憳鍚嶅崟", "濮旀墭淇� - 鎶曚繚浜哄憳鍚嶅崟"),
+// CHANGE_MEMBER_LIST_LATTER(20, "濮旀墭淇� - 鍔犲噺淇濅汉鍛樺悕鍗�", "濮旀墭淇� - 鍔犲噺淇濅汉鍛樺悕鍗�"),
+ WTB_BD_DONE_PDF(21, "濮旀墭鎶曚繚鍗� - 鍚堝苟鍗曟渶缁堜繚鍗�", "濮旀墭鎶曚繚鍗� - 鍚堝苟鍗曟渶缁堜繚鍗�"),
+ WTB_CA_DONE_PDF(23, "濮旀墭鍔犲噺淇�/鎹㈠巶涓氬姟 - 鍚堝苟鍗曟渶缁堜繚鍗�", "濮旀墭鍔犲噺淇�/鎹㈠巶涓氬姟 - 鍚堝苟鍗曟渶缁堜繚鍗�"),
+ WTB_CONFIRMATION_LATTER(24, "濮旀墭淇� - 鎶曚繚鏂规纭涔�", "濮旀墭淇� - 鎶曚繚鏂规纭涔�"),
+ WTB_CA_TBD_PDF(25, "濮旀墭鍔犲噺淇�/鎹㈠巶涓氬姟 -鐢宠鍗曪紙鍟嗘埛绛剧讲鍚嶱DF锛�", "濮旀墭鍔犲噺淇�/鎹㈠巶涓氬姟 -鐢宠鍗曪紙鍟嗘埛绛剧讲鍚嶱DF锛�"),
;
// 鎴愬憳鍙橀噺
private String name;
@@ -546,7 +575,7 @@
public static void main(String[] args) {
- System.out.println("hello&&devicenumber=22110002&&uuid=1e52008fb8ff\n".length());
+ System.out.println("{\"companyName\":\"搴斿疂绉戞妧\",\"endtime\":\"2024-03-01 17:19:00\",\"erpId\":\"4D40185D5BC74A13821BE46EAF8B4179\",\"erpWithVisitDTOList\":[],\"faceImg\":\"20240304/1709518170325_742.jpg\",\"idcardNo\":\"342501199609300535\",\"idcardType\":0,\"name\":\"榛勬檵\",\"phone\":\"17756328697\",\"reason\":\"鎺㈤櫓\",\"receptMemberId\":\"E7E514BD7DE3F27CE0530B630A0AEAE0\",\"starttime\":\"2024-03-01 13:18:00\"}");
}
/**
* 鐢ㄦ埛绫诲瀷 0绯荤粺鐢ㄦ埛 1浼佷笟鐢ㄦ埛 2鏈嶅姟鏈烘瀯绠＄悊鍛� 3鏈嶅姟鏈烘瀯瀛愯处鍙� 4缁煎悎鏈嶅姟鍗曚綅绠＄悊鍛� 5缁煎悎鏈嶅姟鍗曚綅瀛愯处鍙� 6涓撳 7鍘垮尯鐢ㄦ埛 8甯傚眬鐢ㄦ埛
@@ -555,7 +584,7 @@
SYSTEM(0, "绯荤粺鐢ㄦ埛", "绠＄悊鍛�",Arrays.asList(0,1,2,3,4,5,6,7,8,9,10,11)),
COMPANY(1, "浼佷笟鐢ㄦ埛", "浼佷笟",Arrays.asList(-1)),
- ZHUBO(2, "涓绘挱", "涓绘挱",Arrays.asList(-1)),
+ ZHUBO(2, "鍟嗘埛", "鍟嗘埛",Arrays.asList(-1)),
;
// 鎴愬憳鍙橀噺
private String name;
@@ -686,6 +715,14 @@
THSQZ(5, "鐢宠閫�鍥�"),
YGB(6, "宸插叧闂�"),
DQYQZ(7, "寰呯缃�"),
+
+ WTBDQS(28, "寰呯缃�"),
+ WTBDSH(22, "寰呭鏍�"),
+ WTBDCD(23, "寰呭嚭鍗�"),
+ WTBYTH(24, "宸查��鍥�"),
+ WTBYGB(25, "宸插叧闂�"),
+ WTBTBZ(26, "鎶曚繚涓�"),
+ WTBBZZ(27, "淇濋殰涓�"),
;
// 鎴愬憳鍙橀噺
private String name;
@@ -728,43 +765,78 @@
public enum ApplyLogType {
- 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_APPROVE(14, "鎵瑰崟瀹屾垚","淇濋櫓鐢熸晥璧锋湡锛�${param1}鍙樻洿涓�${param2}"),
- 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, "椹冲洖閫�鍥炵敵璇�",""),
- CA_PALTFORM_EDIT_PIDAN(21, "淇敼鎵瑰崟","淇敼鍘熷洜锛�${param}"),
- PALTFORM_EDIT_BD(22, "淇敼淇濆崟","淇敼鍘熷洜锛�${param}"),
- CA_JIAJIAN_APPLY_SIGN(23, "鍔犲噺淇濈敵璇蜂紒涓氱绔�",""),
+ UPLOAD(0, "鎻愪氦鎶曚繚","鎻愪氦鎰忚锛�${param}",0),
+ PLATFORM_RETURN(1, "閫�鍥炴姇淇�","鎻愪氦鎰忚锛�${param}",0),
+ WAIT_SIGNATURE(2, "涓婁紶鎶曚繚鍗�","鎻愪氦鎰忚锛�${param}",0),
+ SIGNATURE(3, "浼佷笟绛剧珷","",0),
+ FAIL_RETURN(4, "淇濆崟鍑哄叿澶辫触閫�鍥�","鎻愪氦鎰忚锛�${param}",0),
+ UPLOAD_INSURANCE(5, "淇濆崟瀹屾垚","淇濋櫓鐢熸晥璧锋湡锛�${param1}鍙樻洿涓�${param2}",0),
+ COMPANY_APPLY_RETURN(6, "鐢宠閫�鍥�","鎻愪氦鎰忚锛�${param}",0),
+ COMPANY_APPLY_CLOSE(7, "鍏抽棴鐢宠","",0),
+ PLATFORM_AGREE_BACK(8, "鍚屾剰閫�鍥炵敵璇�","",0),
+ PLATFORM_UN_AGREE_BACK(9, "椹冲洖閫�鍥炵敵璇�","鎻愪氦鎰忚锛�${param}",0),
+ COMPANY_EDIT(10, "淇濆崟淇敼","鎻愪氦鎰忚锛�${param1}\n${param2}",0),
+ PLATFORM_CHECK_PASS(11, "鎶曚繚瀹℃牳閫氳繃","鎻愪氦鎰忚锛�${param}",0),
- CA_CHANGUNIT_APPLY_SIGN(24, "鎹㈡垚鐢宠浼佷笟绛剧珷",""),
+ CA_PLATFORM_CHECK_PASS_NO(12, "閫�鍥炴姇淇�","鎻愪氦鎰忚锛�${param}",1),
+ CA_PLATFORM_AGREE_BACK_APPLY(13, "鍚屾剰閫�鍥炵敵璇�","鎻愪氦鎰忚锛�${param}",1),
+ CA_PLATFORM_APPROVE(14, "鎵瑰崟瀹屾垚","淇濋櫓鐢熸晥璧锋湡锛�${param1}鍙樻洿涓�${param2}",1),
+ CA_PLATFORM_CHECK_SIGNATURE(15, "浼佷笟绛剧珷","",1),
+ CA_COMPANY_EDIT(16, "鎵瑰崟淇敼","鎻愪氦鎰忚锛�${param1}\n${param2}",1),
+ CA_COMPANY_COMMIT(17, "鎻愪氦鎶曚繚","",1),
+ CA_COMPANY_BACK_APPLY(18, "鐢宠閫�鍥�","鎻愪氦鎰忚锛�${param}",1),
+ CA_COMPANY_CLOSE(19, "鍏抽棴璁㈠崟","",1),
+ CA_PALTFORM_REFUSE_APPLY(20, "椹冲洖閫�鍥炵敵璇�","",1),
+ CA_PALTFORM_EDIT_PIDAN(21, "淇敼鎵瑰崟","淇敼鍘熷洜锛�${param}",1),
+ CA_JIAJIAN_APPLY_SIGN(23, "鍔犲噺淇濈敵璇蜂紒涓氱绔�","",1),
+ CA_CHANGUNIT_APPLY_SIGN(24, "鎹㈠巶鐢宠浼佷笟绛剧珷","",1),
+ CA_UPLOAD_AGAIN(25, "鍐嶆鎶曚繚","",1),
+
+ WTB_FINISH_FAQRS(26, "濮旀墭淇� - 浼佷笟瀹屾垚绛剧讲鏂规纭涔�","",0),
+ WTB_FINISH_MEMBER_LIST(27, "濮旀墭淇� - 浼佷笟瀹屾垚绛剧讲浜哄憳鍚嶅崟","",0),
+ CA_WTB_FINISH_MEMBER_LIST(28, "濮旀墭淇� - 鍔犲噺淇濈缃蹭汉鍛樺悕鍗�","",1),
+ UPLOAD_AGAIN(29, "鍐嶆鎶曚繚","",0),
+ PALTFORM_EDIT_BD(30, "淇敼淇濆崟","淇敼鍘熷洜锛�${param}",0),
+ SHOP_CLOSE_WTB_APPLY(31, "鍏抽棴鐢宠","鍘熷洜锛�${param}",0),
+
+
+ /**
+ * 濮旀墭淇� 鎶曚繚鍗曞悎骞跺崟鏃ュ織
+ */
+ IA_HBD_UPLOAD(32, "鎻愪氦鐢宠","",3),
+ IA_HBD_UPLOAD_TBD(33, "涓婁紶鎶曚繚鍗�","",3),
+ IA_HBD_SIGNATURE_TBD(34, "鍟嗘埛绛剧珷","",3),
+ IA_HBD_UPLOAD_INSURANCE(35, "鎶曚繚瀹屾垚","淇濋櫓鐢熸晥璧锋湡锛�${param1}鍙樻洿涓�${param2}",3),
+ IA_HBD_CLOSE(36, "閫�鍥炵敵璇�","鍘熷洜锛�${param}",3),
+ IA_HBD_UPLOAD_BXD(41, "涓婁紶淇濋櫓鍗�","",3),
+
+
+
+ /**
+ * 濮旀墭淇� 鍔犲噺淇�/鎹㈠巶 鍚堝苟鍗�
+ */
+ CA_HBD_UPLOAD(37, "鎻愪氦鐢宠","",4),
+ CA_HBD_SIGNATURE_TBD(38, "鍟嗘埛绛剧珷","",4),
+ CA_HBD_UPLOAD_INSURANCE(39, "鎶曚繚瀹屾垚","",4),
+ CA_HBD_CLOSE(40, "閫�鍥炵敵璇�","鍘熷洜锛�${param}",4),
+
+
+
+
+
;
// 鎴愬憳鍙橀噺
private String name;
private String info;
private int key;
+ private int type;
// 鏋勯�犳柟娉�
- ApplyLogType(int key, String name,String info) {
+ ApplyLogType(int key, String name,String info,int type) {
this.name = name;
this.info = info;
this.key = key;
+ this.type = type;
}
// 鏅�氭柟娉�
@@ -778,6 +850,183 @@
}
public static String getInfo(int index) {
for (ApplyLogType c : ApplyLogType.values()) {
+ if (c.getKey() == index) {
+ return c.info;
+ }
+ }
+ return null;
+ }
+ public static List<Integer> getTypeList(int type) {
+ List<Integer> list = new ArrayList<>();
+ for (ApplyLogType c : ApplyLogType.values()) {
+ if (c.getType() == type) {
+ list.add(c.getKey());
+ }
+ }
+ return list;
+ }
+
+
+ // 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 int getType() {
+ return type;
+ }
+
+ public void setType(int type) {
+ this.type = type;
+ }
+ }
+
+ public enum UnionApplyStatus {
+ MERGE(0, "寰呭鏍�","",0),
+ WAIT_SIGNATURE(1, "寰呯缃�","",0),
+ UPLOAD_INSURANCE_POLICY(2, "寰呭嚭鍗�","",0),
+ FINISH(3, "淇濋殰涓�","",0),
+ CLOSE(4, "宸查��鍥�","",0),
+ ;
+ // 鎴愬憳鍙橀噺
+ private String name;
+ private String info;
+ private int key;
+ private int collectStatus;
+
+
+ // 鏋勯�犳柟娉�
+ UnionApplyStatus(int key, String name,String info,int collectStatus) {
+ this.name = name;
+ this.key = key;
+ this.info = info;
+ this.collectStatus = collectStatus;
+ }
+
+ // 鏅�氭柟娉�
+ public static String getName(int index) {
+ for (UnionApplyStatus c : UnionApplyStatus.values()) {
+ if (c.getKey() == index) {
+ return c.name;
+ }
+ }
+ return null;
+ }
+ public static List<Integer> getKesByStatus(Integer collectStatus) {
+ List<Integer> list = new ArrayList<>();
+ if(collectStatus!=null){
+ for (UnionApplyStatus c : UnionApplyStatus.values()) {
+ if (Constants.equalsInteger(c.getCollectStatus() ,collectStatus)) {
+ list.add(c.getKey());
+ }
+ }
+ }
+ return list;
+ }
+ public static Integer getCollectStatus(Integer index) {
+ for (UnionApplyStatus c : UnionApplyStatus.values()) {
+ if (Constants.equalsInteger(c.getKey() , index)) {
+ return c.collectStatus;
+ }
+ }
+ return null;
+ }
+ public static String getInfo(int index) {
+ for (UnionApplyStatus c : UnionApplyStatus.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 int getCollectStatus() {
+ return collectStatus;
+ }
+
+ public void setCollectStatus(int collectStatus) {
+ this.collectStatus = collectStatus;
+ }
+ }
+
+
+
+ public enum UnionChangeStatus {
+ MERGE(0, "寰呯缃�",""),
+ UPLOAD_INSURANCE_POLICY(1, "寰呭嚭鍗�",""),
+ FINISH(2, "淇濋殰涓�",""),
+ CLOSE(3, "宸查��鍥�",""),
+ ;
+ // 鎴愬憳鍙橀噺
+ private String name;
+ private String info;
+ private int key;
+
+
+ // 鏋勯�犳柟娉�
+ UnionChangeStatus(int key, String name,String info) {
+ this.name = name;
+ this.key = key;
+ this.info = info;
+ }
+
+ // 鏅�氭柟娉�
+ public static String getName(int index) {
+ for (UnionChangeStatus c : UnionChangeStatus.values()) {
+ if (c.getKey() == index) {
+ return c.name;
+ }
+ }
+ return null;
+ }
+ public static String getInfo(int index) {
+ for (UnionChangeStatus c : UnionChangeStatus.values()) {
if (c.getKey() == index) {
return c.info;
}
@@ -822,7 +1071,20 @@
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),
+ COMPANY_BACK_APPLY_PASS(11, "浼佷笟鐢宠閫�鍥�(骞冲彴鎶曚繚瀹℃牳閫氳繃)","鎻愪氦鎰忚锛�${param}",5),
+
+
+
+ WTB_UPLOAD(20, "鎻愪氦鎶曚繚","",28),
+ WTB_COMPANY_APPLY_SIGNATURE(21, "浼佷笟宸茬缃叉姇淇濈‘璁や功","鎻愪氦鎰忚锛�${param}",28),
+ WTB_COMPANY_MEMBER_LIST_SIGNATURE(22, "浼佷笟宸茬缃蹭汉鍛樺悕鍗�","鎻愪氦鎰忚锛�${param}",22),
+ WTB_BUSINESS_CHECK_PASS(23,"鍟嗘埛鎶曚繚瀹℃牳閫氳繃","鎻愪氦鎰忚锛�${param}",23),
+ WTB_RETURN(24, "宸查��鍥�","鎻愪氦鎰忚锛�${param}",24),
+ WTB_CLOSED(25, "宸插叧闂�","鎻愪氦鎰忚锛�${param}",25),
+ WTB_TOUBAOING(26, "鎶曚繚涓�","鎻愪氦鎰忚锛�${param}",26),
+ WTB_DONE(27, "淇濋殰涓�","鎻愪氦鎰忚锛�${param}",27),
+
;
// 鎴愬憳鍙橀噺
private String name;
@@ -972,12 +1234,18 @@
public enum NoticeType {
- ZERO(0, "寰呭鎵�","","","寰呭鏍�","宸茬敵璇�","寰呭彈鐞�"),
- ONE(1, "浼佷笟寰呯缃�","","","宸ョ寰呭鏍�","","瀹屾垚鍙楃悊"),
+ ZERO(0, "寰呭鎵�","","","寰呭鏍�","寰呭鐞�","澶勭悊涓�"),
+ ONE(1, "浼佷笟寰呯缃�","","","宸ョ寰呭鏍�","","宸茬粨妗�"),
TWO(2, "寰呭嚭鍗�","寰呭鎵�","寰呭鎵�","","",""),
THREE(3, "鐢宠閫�鍥�","鐢宠閫�鍥�","鐢宠閫�鍥�","","",""),
- FOUR(4, "宸查��鍥�","宸查��鍥�","宸查��鍥�","","",""),
- FIVE(5, "鐢宠椹冲洖","鐢宠椹冲洖","鐢宠椹冲洖","","","")
+ FOUR(4, "宸查��鍥�","宸查��鍥�","宸查��鍥�","","","宸叉挙閿�"),
+ FIVE(5, "鐢宠椹冲洖","鐢宠椹冲洖","鐢宠椹冲洖","","",""),
+ //缁繚閫氱煡
+ SIX(6, "","","","","",""),
+ //鍟嗘埛绔� 濮旀墭淇� - 鎶曚繚寰呭鏍� 鍔犲噺淇� 鎹㈠巶 寰呭鏍�
+ SEVEN(7, "寰呭鏍�","寰呭鏍�","寰呭鏍�","","",""),
+ EIGHT(8, "","","","","",""),
+ NINE(9, "","","","","",""),
;
// 鎴愬憳鍙橀噺
@@ -1107,13 +1375,14 @@
public enum ApplyChangeStatus {
UPLOAD(0, "鎻愪氦鍔犲噺淇�/鎹㈠巶鐢宠"),
SIGNATURE(1, "宸茬绔�"),
- APPROVE(2, "宸蹭笂浼犲鎵�"),
+ APPROVE(2, "宸蹭笂浼犲鏍�"),
RETURN_APPLY_UPLOAD(3, "鍙戣捣閫�鍥炵敵璇�(寰呭鏍�)"),
RETURN_APPLY_SIGNATURE(4, "鍙戣捣閫�鍥炵敵璇凤紙宸茬绔狅級"),
PLATFORM_AGREE(5, "骞冲彴鍚屾剰锛堝凡閫�鍥烇級"),
CLOSE(6, "宸插叧闂�"),
- PALTFORM_CHECK_PASS(7, "瀹℃牳閫氳繃"),
+ CHECHED_PASSED(7, "瀹℃牳閫氳繃"),
PALTFORM_CHECK_PASS_NO(8, "瀹℃牳涓嶉�氳繃"),
+ WTB_TOUBAOING(9, "鎶曚繚涓�"),
;
// 鎴愬憳鍙橀噺
private String name;
@@ -1277,8 +1546,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