From 603a69f583edd472772526de5e57eb4fe724ddc3 Mon Sep 17 00:00:00 2001
From: nidapeng <jp@doumee.com>
Date: 星期三, 03 四月 2024 10:20:32 +0800
Subject: [PATCH] 提交一把
---
server/service/src/main/java/com/doumee/core/utils/Constants.java | 43 ++++++++++++++++++++++++++++++-------------
1 files changed, 30 insertions(+), 13 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 38fdde8..e215b17 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
@@ -158,11 +158,16 @@
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;
+
}
@@ -442,14 +447,13 @@
HBD_BD_APPLY_PDF(15, "鍚堝苟鍗�-淇濆崟鐢宠琛≒DF ", "鍚堝苟鍗�-淇濆崟鐢宠琛≒DF "),
HBD_BD_SIGNED_PDF(16, "鍚堝苟鍗�-绛剧讲鍚庝繚鍗曠敵璇疯〃PDF", "鍚堝苟鍗�-绛剧讲鍚庝繚鍗曠敵璇疯〃PDF"),
- COMPANY_TBD_SIGNED(17, "鍚堝苟鍗�-鎶曚繚鍗�-鍟嗘埛鎻愪氦", "鍚堝苟鍗�-鎶曚繚鍗�-鍟嗘埛鎻愪氦"),
SOLUTIONS_CONFIRMATION_LATTER(18, "鎶曚繚鏂规纭涔�", "鎶曚繚鏂规纭涔�"),
MEMBER_LIST_LATTER(19, "濮旀墭淇� - 鎶曚繚浜哄憳鍚嶅崟", "濮旀墭淇� - 鎶曚繚浜哄憳鍚嶅崟"),
CHANGE_MEMBER_LIST_LATTER(20, "濮旀墭淇� - 鍔犲噺淇濅汉鍛樺悕鍗�", "濮旀墭淇� - 鍔犲噺淇濅汉鍛樺悕鍗�"),
WTB_BD_DONE_PDF(21, "濮旀墭鎶曚繚鍗� - 鍚堝苟鍗曟渶缁堜繚鍗�", "濮旀墭鎶曚繚鍗� - 鍚堝苟鍗曟渶缁堜繚鍗�"),
- COMPANY_TBD_SIGNED_PDF(22, "鍚堝苟鍗�-鎶曚繚鍗�-鍟嗘埛鎻愪氦锛堜紒涓氱缃诧級PDF", "鍚堝苟鍗�-鎶曚繚鍗�-鍟嗘埛鎻愪氦锛堜紒涓氱缃诧級PDF"),
WTB_CA_DONE_PDF(23, "濮旀墭鍔犲噺淇�/鎹㈠巶涓氬姟 - 鍚堝苟鍗曟渶缁堜繚鍗�", "濮旀墭鍔犲噺淇�/鎹㈠巶涓氬姟 - 鍚堝苟鍗曟渶缁堜繚鍗�"),
WTB_CONFIRMATION_LATTER(24, "濮旀墭淇� - 鎶曚繚鏂规纭涔�", "濮旀墭淇� - 鎶曚繚鏂规纭涔�"),
+ WTB_CA_TBD_PDF(25, "濮旀墭鍔犲噺淇�/鎹㈠巶涓氬姟 -鎶曚繚鍗曪紙浼佷笟绛剧讲鍚嶱DF锛�", "濮旀墭鍔犲噺淇�/鎹㈠巶涓氬姟 -鎶曚繚鍗曪紙浼佷笟绛剧讲鍚嶱DF锛�"),
;
// 鎴愬憳鍙橀噺
private String name;
@@ -793,15 +797,23 @@
/**
- * 濮旀墭淇濆悎骞跺崟
+ * 濮旀墭淇� 鎶曚繚鍗曞悎骞跺崟鏃ュ織
*/
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_SIGNATURE_TBD(34, "鍟嗘埛绛剧珷","",3),
+ IA_HBD_UPLOAD_INSURANCE(35, "鎶曚繚瀹屾垚","淇濋櫓鐢熸晥璧锋湡锛�${param1}鍙樻洿涓�${param2}",3),
IA_HBD_CLOSE(36, "閫�鍥炵敵璇�","鍘熷洜锛�${param}",3),
+
+ /**
+ * 濮旀墭淇� 鍔犲噺淇�/鎹㈠巶 鍚堝苟鍗�
+ */
+ CA_HBD_UPLOAD(37, "鎻愪氦鐢宠","",4),
+ CA_HBD_SIGNATURE_TBD(38, "鍟嗘埛绛剧珷","",4),
+ CA_HBD_UPLOAD_INSURANCE(39, "鎶曚繚瀹屾垚","",4),
+ CA_HBD_CLOSE(40, "閫�鍥炵敵璇�","鍘熷洜锛�${param}",4),
@@ -981,10 +993,10 @@
public enum UnionChangeStatus {
- MERGE(0, "寰呯缃茬敵璇峰崟",""),
- UPLOAD_INSURANCE_POLICY(1, "寰呬笂浼犱繚鍗�",""),
+ MERGE(0, "寰呯缃�",""),
+ UPLOAD_INSURANCE_POLICY(1, "寰呭嚭鍗�",""),
FINISH(2, "淇濋殰涓�",""),
- CLOSE(3, "鍏抽棴",""),
+ CLOSE(3, "宸查��鍥�",""),
;
// 鎴愬憳鍙橀噺
private String name;
@@ -1223,7 +1235,12 @@
THREE(3, "鐢宠閫�鍥�","鐢宠閫�鍥�","鐢宠閫�鍥�","","",""),
FOUR(4, "宸查��鍥�","宸查��鍥�","宸查��鍥�","","","宸叉挙閿�"),
FIVE(5, "鐢宠椹冲洖","鐢宠椹冲洖","鐢宠椹冲洖","","",""),
- SIX(6, "","","","","","")
+ //缁繚閫氱煡
+ SIX(6, "","","","","",""),
+ //鍟嗘埛绔� 濮旀墭淇� - 鎶曚繚寰呭鏍� 鍔犲噺淇� 鎹㈠巶 寰呭鏍�
+ SEVEN(7, "寰呭鏍�","寰呭鏍�","寰呭鏍�","","",""),
+ EIGHT(8, "","","","","",""),
+ NINE(9, "","","","","",""),
;
// 鎴愬憳鍙橀噺
--
Gitblit v1.9.3