From 3c2e49d7bcc91268a75689db400d1f1698c0f8b7 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期日, 04 二月 2024 16:41:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/service/src/main/java/com/doumee/core/utils/Constants.java | 81 +++++++++++++++++++++++++++++++++++++---
1 files changed, 74 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 b366917..ff6ca38 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
@@ -168,7 +168,7 @@
if(solutions.getInsureCycleUnit().equals(Constants.ZERO)){
countCyclePriceVO.setEndDate(
DateUtil.getMontageDate(
- DateUtil.afterDateByType(startDate,0,solutions.getInsureCycle())
+ DateUtil.afterDateByType(startDate,0,solutions.getInsureCycle()-1)
,2)
);
}else if(solutions.getInsureCycleUnit().equals(Constants.TWO)){
@@ -177,7 +177,7 @@
//鑾峰彇澶╂暟鍚庣殑鏃ユ湡
Date afterDate = DateUtil.afterDateByType(startDate,0,monthDays);
//璧嬪�� 姣忔棩缁撴潫鏃跺垎绉�
- countCyclePriceVO.setEndDate(DateUtil.getMontageDate(afterDate,2));
+ countCyclePriceVO.setEndDate(DateUtil.getMontageDate(afterDate,3));
}else if(solutions.getInsureCycleUnit().equals(Constants.THREE)){
//鑾峰彇X骞村悗鏃ユ湡 澶氫簡涓�澶�
Date afterDate = DateUtil.afterDateByType(startDate,2,solutions.getInsureCycle());
@@ -191,13 +191,13 @@
public static Integer getSexByIdCard(String idCard){
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;
@@ -764,7 +764,7 @@
CA_PALTFORM_EDIT_PIDAN(21, "淇敼鎵瑰崟","淇敼鍘熷洜锛�${param}",1),
PALTFORM_EDIT_BD(22, "淇敼淇濆崟","淇敼鍘熷洜锛�${param}",1),
CA_JIAJIAN_APPLY_SIGN(23, "鍔犲噺淇濈敵璇蜂紒涓氱绔�","",1),
- CA_CHANGUNIT_APPLY_SIGN(24, "鎹㈡垚鐢宠浼佷笟绛剧珷","",1),
+ CA_CHANGUNIT_APPLY_SIGN(24, "鎹㈠巶鐢宠浼佷笟绛剧珷","",1),
CA_UPLOAD_AGAIN(25, "鍐嶆鎶曚繚","",1),
;
// 鎴愬憳鍙橀噺
@@ -1140,7 +1140,7 @@
public enum ApplyChangeStatus {
UPLOAD(0, "鎻愪氦鍔犲噺淇�/鎹㈠巶鐢宠"),
SIGNATURE(1, "宸茬绔�"),
- APPROVE(2, "宸蹭笂浼犲鎵�"),
+ APPROVE(2, "宸蹭笂浼犲鏍�"),
RETURN_APPLY_UPLOAD(3, "鍙戣捣閫�鍥炵敵璇�(寰呭鏍�)"),
RETURN_APPLY_SIGNATURE(4, "鍙戣捣閫�鍥炵敵璇凤紙宸茬绔狅級"),
PLATFORM_AGREE(5, "骞冲彴鍚屾剰锛堝凡閫�鍥烇級"),
@@ -1306,6 +1306,73 @@
+
+ public enum ApplyChangeLogStatus {
+ UPLOAD(0, "鍙戣捣鐢宠",""),
+ RETURN_APPLY(3, "鍙戣捣閫�鍥炵敵璇�","鎻愪氦鎰忚锛�${param}"),
+ PLATFORM_AGREE(4, "骞冲彴瀹℃牳閫氳繃" ,"鎻愪氦鎰忚锛�${param}"),
+ PLATFORM_UN_AGREE(0, "瀹℃牳椹冲洖","鎻愪氦鎰忚锛�${param}"),
+ CLOSE(5, "鍏抽棴",""),
+ ;
+ // 鎴愬憳鍙橀噺
+ private String name;
+ private String info;
+ private int key;
+
+ // 鏋勯�犳柟娉�
+ ApplyChangeLogStatus(int key, String name,String info) {
+ this.name = name;
+ this.info = info;
+ this.key = key;
+ }
+
+ // 鏅�氭柟娉�
+ public static String getName(int index) {
+ for (ApplyChangeLogStatus c : ApplyChangeLogStatus.values()) {
+ if (c.getKey() == index) {
+ return c.name;
+ }
+ }
+ return null;
+ }
+ public static String getInfo(int index) {
+ for (ApplyChangeLogStatus c : ApplyChangeLogStatus.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 enum ProjectRecord {
COM_EDITING(0, "浼佷笟淇濆瓨鏁版嵁", "鐢� ${param2} ${param3}淇濆瓨鎴愬姛锛屽綋鍓嶈繘搴︿负 銆�${param4}銆�"),
--
Gitblit v1.9.3