Merge remote-tracking branch 'origin/1.0.1' into 1.0.1

k94314517

2024-04-01 d281d0d8bda64e2296f7fce8268cfc10bc5b23d0

 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;

    }


@@ -450,6 +455,7 @@
        COMPANY_TBD_SIGNED_PDF(22, "合并单-投保单-商户提交（企业签署）PDF", "合并单-投保单-商户提交（企业签署）PDF"),
        WTB_CA_DONE_PDF(23, "委托加减保/换厂业务 - 合并单最终保单", "委托加减保/换厂业务 - 合并单最终保单"),
        WTB_CONFIRMATION_LATTER(24, "委托保 - 投保方案确认书", "委托保 - 投保方案确认书"),
        WTB_CA_TBD_PDF(25, "委托加减保/换厂业务 -投保单（企业签署后PDF）", "委托加减保/换厂业务 -投保单（企业签署后PDF）"),
        ;
        // 成员变量
        private String name;
@@ -793,15 +799,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 +995,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;