From 8603613a12466bd41aaeb8db6da56a56c24f8450 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期日, 04 二月 2024 18:31:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/service/src/main/java/com/doumee/core/utils/Constants.java | 109 +++++++++++++++++++++++++++++++++++-------------------
1 files changed, 71 insertions(+), 38 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 09ba80d..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
@@ -166,14 +166,23 @@
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;
@@ -182,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;
@@ -635,8 +644,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 +687,7 @@
}
public enum ApplyCollectStatus {
- DSP(0, "寰呭鏍�"),
+ DSP(0, "寰呭鎵�"),
DCD(1, "寰呭嚭鍗�"),
BZZ(2, "淇濋殰涓�"),
YGQ(3, "宸茶繃鏈�"),
@@ -728,43 +737,48 @@
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, "鎶曚繚瀹℃牳閫氳繃","",0),
+ UPLOAD_AGAIN(26, "鍐嶆鎶曚繚","",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, "鎻愪氦鎶曚繚","鎻愪氦鎰忚锛�${param}",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),
+ PALTFORM_EDIT_BD(22, "淇敼淇濆崟","淇敼鍘熷洜锛�${param}",1),
+ CA_JIAJIAN_APPLY_SIGN(23, "鍔犲噺淇濈敵璇蜂紒涓氱绔�","",1),
+ CA_CHANGUNIT_APPLY_SIGN(24, "鎹㈠巶鐢宠浼佷笟绛剧珷","",1),
+ CA_UPLOAD_AGAIN(25, "鍐嶆鎶曚繚","",1),
;
// 鎴愬憳鍙橀噺
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;
}
// 鏅�氭柟娉�
@@ -784,6 +798,16 @@
}
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() {
@@ -809,6 +833,15 @@
public void setInfo(String info) {
this.info = info;
}
+
+
+ public int getType() {
+ return type;
+ }
+
+ public void setType(int type) {
+ this.type = type;
+ }
}
public enum InsuranceApplyStatus {
@@ -822,7 +855,7 @@
COMPANY_BACK_APPLY_WAIT_SIGNATURE(7, "浼佷笟鐢宠閫�鍥�(寰呯绔�)","鎻愪氦鎰忚锛�${param}",5),
COMPANY_BACK_APPLY_SIGNATURE(8, "浼佷笟鐢宠閫�鍥�(宸茬绔�)","鎻愪氦鎰忚锛�${param}",5),
CLOSE(9, "璁㈠崟鍏抽棴","",6),
- PLATFORM_CHECK_PASS(10,"骞冲彴鎶曚繚瀹℃牳閫氳繃","鎻愪氦鎰忚锛�${param}",0),
+ PLATFORM_CHECK_PASS(10,"骞冲彴鎶曚繚瀹℃牳閫氳繃","鎻愪氦鎰忚锛�${param}",1),
;
// 鎴愬憳鍙橀噺
private String name;
@@ -972,9 +1005,9 @@
public enum NoticeType {
- ZERO(0, "寰呭鏍�","","","寰呭鏍�","宸茬敵璇�","寰呭彈鐞�"),
+ ZERO(0, "寰呭鎵�","","","寰呭鏍�","宸茬敵璇�","寰呭彈鐞�"),
ONE(1, "浼佷笟寰呯缃�","","","宸ョ寰呭鏍�","","瀹屾垚鍙楃悊"),
- TWO(2, "寰呭嚭鍗�","寰呭鏍�","寰呭鏍�","","",""),
+ TWO(2, "寰呭嚭鍗�","寰呭鎵�","寰呭鎵�","","",""),
THREE(3, "鐢宠閫�鍥�","鐢宠閫�鍥�","鐢宠閫�鍥�","","",""),
FOUR(4, "宸查��鍥�","宸查��鍥�","宸查��鍥�","","",""),
FIVE(5, "鐢宠椹冲洖","鐢宠椹冲洖","鐢宠椹冲洖","","","")
--
Gitblit v1.9.3