From 2b773dd14058d4eeacb38b0813edecc86170fd0c Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期三, 26 六月 2024 15:37:26 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/1.0.1' into 1.0.1 --- server/service/src/main/java/com/doumee/core/utils/Constants.java | 47 ++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 46 insertions(+), 1 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 bfa4a49..fa573fd 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 @@ -4,7 +4,9 @@ import com.doumee.core.constants.ResponseStatus; import com.doumee.core.exception.BusinessException; import com.doumee.dao.business.dto.CountCyclePriceDTO; +import com.doumee.dao.business.model.ApplyChange; import com.doumee.dao.business.model.ApplyDetail; +import com.doumee.dao.business.model.InsuranceApply; import com.doumee.dao.business.model.Solutions; import com.doumee.dao.business.vo.ChangeDealTypeVO; import com.doumee.dao.business.vo.CountCyclePriceVO; @@ -96,7 +98,47 @@ 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; + public static final String COMPANY_PHONE_AUTH ="COMPANY_PHONE_AUTH" ; + + /** + * 鑾峰彇鐢宠鍗曟椂闂村垪鏍囬 + * @param type 0寮�濮嬫椂闂� 1鎴鏃堕棿 + * @param model + * @return + */ + public static String getApplyTimeTitle(int type, InsuranceApply model){ + if(type ==1){ + if(Constants.equalsInteger(model.getSolutionType(),Constants.ONE)){ + return Constants.equalsInteger(model.getUnionApplyTbdStatus(),Constants.THREE)?"淇濋櫓鐢熸晥璧锋湡":"鏈熸湜淇濋櫓鐢熸晥璧锋湡"; + }else{ + return Constants.equalsInteger(model.getStatus(), InsuranceApplyStatus.UPLOAD_INSURANCE.getKey())?"淇濋櫓鐢熸晥璧锋湡":"鏈熸湜淇濋櫓鐢熸晥璧锋湡"; + } + }else{ + if(Constants.equalsInteger(model.getSolutionType(),Constants.ONE)){ + return Constants.equalsInteger(model.getUnionApplyTbdStatus(),Constants.THREE)?"淇濋櫓鐢熸晥姝㈡湡":"棰勮鐢熸晥姝㈡湡"; + }else{ + return Constants.equalsInteger(model.getStatus(), InsuranceApplyStatus.UPLOAD_INSURANCE.getKey())?"淇濋櫓鐢熸晥姝㈡湡":"棰勮鐢熸晥姝㈡湡"; + } + } + + } + + /** + * 鑾峰彇鎵规敼鍗曟椂闂存爣棰樺垪 + * @param type 0鏇存崲娲鹃仯鍗曚綅 1鍔犱繚 0鍑忎繚 + * @param model + * @return + */ + public static String getChangeApplyTimeTitle(int type, ApplyChange model){ + if(type ==2){ + return Constants.equalsInteger(model.getStatus(), ApplyChangeStatus.APPROVE.getKey())?"鎵瑰崟鐢熸晥鏈�":"鏈熸湜鎵瑰崟鐢熸晥鏈�"; + }else if(type ==1){ + return Constants.equalsInteger(model.getStatus(), ApplyChangeStatus.APPROVE.getKey())?"鎵瑰鐢熸晥璧锋湡":"鏈熸湜鎵瑰鐢熸晥璧锋湡"; + }else{ + return Constants.equalsInteger(model.getStatus(), ApplyChangeStatus.APPROVE.getKey())?"鎵瑰噺鐢熸晥璧锋湡":"鏈熸湜鎵瑰噺鐢熸晥璧锋湡"; + } + } /** * 浼佷笟鏁版嵁鏉ユ簮 0骞冲彴娉ㄥ唽 1鍚庡彴瀵煎叆 */ @@ -760,7 +802,10 @@ } public static void main(String[] args) { - System.out.println(Constants.getSexByIdCard("41052119910310001X")); + System.out.println(IdcardUtil.isValidCard("342623199201150101")); + System.out.println(IdcardUtil.isValidCard("342623199201150102")); + System.out.println(IdcardUtil.isValidCard("342623199201150103")); + System.out.println(IdcardUtil.isValidCard("342623199201150104")); // System.out.println(IdcardUtil.isValidCard("340621199310134818")); // System.out.println(IdcardUtil.isValidCard("341621199310134818")); -- Gitblit v1.9.3