From 0a35a0ebbe694b87f2531d133b3be6b95bd62c69 Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期三, 08 五月 2024 14:21:17 +0800 Subject: [PATCH] 提交一把 --- server/service/src/main/java/com/doumee/core/utils/Constants.java | 19 +++++++++++++------ 1 files changed, 13 insertions(+), 6 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 6788a98..b23f984 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 @@ -85,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鍚庡彴瀵煎叆 @@ -197,6 +198,9 @@ } public static Integer getSexByIdCard(String idCard){ + if(StringUtils.isBlank(idCard)){ + return 2; + } Pattern pattern = Pattern.compile("\\d{17}[\\d|x]"); // 瀹氫箟韬唤璇佸彿鐮佹牸寮忕殑姝e垯琛ㄨ揪寮� Matcher matcher = pattern.matcher(idCard); Integer sex = 0; @@ -208,7 +212,7 @@ sex = 1; } } else { - sex = -1; + sex = 2; } return sex; } @@ -453,7 +457,7 @@ WTB_BD_DONE_PDF(21, "濮旀墭鎶曚繚鍗� - 鍚堝苟鍗曟渶缁堜繚鍗�", "濮旀墭鎶曚繚鍗� - 鍚堝苟鍗曟渶缁堜繚鍗�"), WTB_CA_DONE_PDF(23, "濮旀墭鍔犲噺淇�/鎹㈠巶涓氬姟 - 鍚堝苟鍗曟渶缁堜繚鍗�", "濮旀墭鍔犲噺淇�/鎹㈠巶涓氬姟 - 鍚堝苟鍗曟渶缁堜繚鍗�"), WTB_CONFIRMATION_LATTER(24, "濮旀墭淇� - 鎶曚繚鏂规纭涔�", "濮旀墭淇� - 鎶曚繚鏂规纭涔�"), - WTB_CA_TBD_PDF(25, "濮旀墭鍔犲噺淇�/鎹㈠巶涓氬姟 -鎶曚繚鍗曪紙浼佷笟绛剧讲鍚嶱DF锛�", "濮旀墭鍔犲噺淇�/鎹㈠巶涓氬姟 -鎶曚繚鍗曪紙浼佷笟绛剧讲鍚嶱DF锛�"), + WTB_CA_TBD_PDF(25, "濮旀墭鍔犲噺淇�/鎹㈠巶涓氬姟 -鐢宠鍗曪紙鍟嗘埛绛剧讲鍚嶱DF锛�", "濮旀墭鍔犲噺淇�/鎹㈠巶涓氬姟 -鐢宠鍗曪紙鍟嗘埛绛剧讲鍚嶱DF锛�"), ; // 鎴愬憳鍙橀噺 private String name; @@ -703,7 +707,7 @@ } public enum ApplyCollectStatus { - DSP(0, "寰呭鎵�"), + DSP(0, "寰呭鏍�"), DCD(1, "寰呭嚭鍗�"), BZZ(2, "淇濋殰涓�"), YGQ(3, "宸茶繃鏈�"), @@ -717,7 +721,8 @@ WTBDCD(23, "寰呭嚭鍗�"), WTBYTH(24, "宸查��鍥�"), WTBYGB(25, "宸插叧闂�"), - WTBTBZ(26, "鎶曚繚涓�"), + //2024骞�4鏈�25鏃�15:17:13 淇敼 鎶曚繚涓� = 銆� 鎵规敼鐢宠涓� + WTBTBZ(26, "鎵规敼鐢宠涓�"), WTBBZZ(27, "淇濋殰涓�"), ; // 鎴愬憳鍙橀噺 @@ -787,6 +792,7 @@ CA_JIAJIAN_APPLY_SIGN(23, "鍔犲噺淇濈敵璇蜂紒涓氱绔�","",1), CA_CHANGUNIT_APPLY_SIGN(24, "鎹㈠巶鐢宠浼佷笟绛剧珷","",1), CA_UPLOAD_AGAIN(25, "鍐嶆鎶曚繚","",1), + CA_HBD_AUDIT(42, "瀹℃壒閫氳繃","鍘熷洜锛�${param}",1), WTB_FINISH_FAQRS(26, "濮旀墭淇� - 浼佷笟瀹屾垚绛剧讲鏂规纭涔�","",0), WTB_FINISH_MEMBER_LIST(27, "濮旀墭淇� - 浼佷笟瀹屾垚绛剧讲浜哄憳鍚嶅崟","",0), @@ -804,6 +810,7 @@ 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), @@ -1229,9 +1236,9 @@ public enum NoticeType { - ZERO(0, "寰呭鎵�","","","寰呭鏍�","寰呭鐞�","澶勭悊涓�"), + ZERO(0, "寰呭鏍�","","","寰呭鏍�","寰呭鐞�","澶勭悊涓�"), ONE(1, "浼佷笟寰呯缃�","","","宸ョ寰呭鏍�","","宸茬粨妗�"), - TWO(2, "寰呭嚭鍗�","寰呭鎵�","寰呭鎵�","","",""), + TWO(2, "寰呭嚭鍗�","寰呭鏍�","寰呭鏍�","","",""), THREE(3, "鐢宠閫�鍥�","鐢宠閫�鍥�","鐢宠閫�鍥�","","",""), FOUR(4, "宸查��鍥�","宸查��鍥�","宸查��鍥�","","","宸叉挙閿�"), FIVE(5, "鐢宠椹冲洖","鐢宠椹冲洖","鐢宠椹冲洖","","",""), -- Gitblit v1.9.3