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

k94314517

2024-04-12 02cb47bef10bafc3a591f160f0b286df529c704a

 server/service/src/main/java/com/doumee/core/utils/Constants.java

@@ -85,6 +85,7 @@
    public static final String SETTLE_FILE ="SETTLE_FILE" ;
    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;

    /**
     * 企业数据来源 0平台注册 1后台导入
@@ -197,6 +198,9 @@
    }

    public static Integer getSexByIdCard(String idCard){
        if(StringUtils.isBlank(idCard)){
            return 2;
        }
        Pattern pattern = Pattern.compile("\\d{17}[\\d|x]"); // 定义身份证号码格式的正则表达式
        Matcher matcher = pattern.matcher(idCard);
        Integer sex = 0;
@@ -208,7 +212,7 @@
                sex = 1;
            }
        } else {
           sex = -1;
           sex = 2;
        }
        return sex;
    }
@@ -447,15 +451,13 @@

        HBD_BD_APPLY_PDF(15, "合并单-保单申请表PDF ", "合并单-保单申请表PDF "),
        HBD_BD_SIGNED_PDF(16, "合并单-签署后保单申请表PDF", "合并单-签署后保单申请表PDF"),
        COMPANY_TBD_SIGNED(17, "合并单-投保单-商户提交", "合并单-投保单-商户提交"),
        SOLUTIONS_CONFIRMATION_LATTER(18, "投保方案确认书", "投保方案确认书"),
        MEMBER_LIST_LATTER(19, "委托保 - 投保人员名单", "委托保 - 投保人员名单"),
        CHANGE_MEMBER_LIST_LATTER(20, "委托保 - 加减保人员名单", "委托保 - 加减保人员名单"),
//        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, "委托加减保/换厂业务 -投保单（企业签署后PDF）", "委托加减保/换厂业务 -投保单（企业签署后PDF）"),
        WTB_CA_TBD_PDF(25, "委托加减保/换厂业务 -申请单（商户签署后PDF）", "委托加减保/换厂业务 -申请单（商户签署后PDF）"),
        ;
        // 成员变量
        private String name;
@@ -705,7 +707,7 @@
    }

    public  enum ApplyCollectStatus {
        DSP(0, "待审批"),
        DSP(0, "待审核"),
        DCD(1, "待出单"),
        BZZ(2, "保障中"),
        YGQ(3, "已过期"),
@@ -789,6 +791,7 @@
        CA_JIAJIAN_APPLY_SIGN(23, "加减保申请企业签章","",1),
        CA_CHANGUNIT_APPLY_SIGN(24, "换厂申请企业签章","",1),
        CA_UPLOAD_AGAIN(25, "再次投保","",1),
        CA_HBD_AUDIT(42, "审批通过","原因：${param}",1),

        WTB_FINISH_FAQRS(26, "委托保 - 企业完成签署方案确认书","",0),
        WTB_FINISH_MEMBER_LIST(27, "委托保 - 企业完成签署人员名单","",0),
@@ -806,6 +809,7 @@
        IA_HBD_SIGNATURE_TBD(34, "商户签章","",3),
        IA_HBD_UPLOAD_INSURANCE(35, "投保完成","保险生效起期：${param1}变更为${param2}",3),
        IA_HBD_CLOSE(36, "退回申请","原因：${param}",3),
        IA_HBD_UPLOAD_BXD(41, "上传保险单","",3),



@@ -1231,13 +1235,18 @@

    public  enum NoticeType {

        ZERO(0, "待审批","","","待审核","待处理","处理中"),
        ZERO(0, "待审核","","","待审核","待处理","处理中"),
        ONE(1, "企业待签署","","","工种待审核","","已结案"),
        TWO(2, "待出单","待审批","待审批","","",""),
        TWO(2, "待出单","待审核","待审核","","",""),
        THREE(3, "申请退回","申请退回","申请退回","","",""),
        FOUR(4, "已退回","已退回","已退回","","","已撤销"),
        FIVE(5, "申请驳回","申请驳回","申请驳回","","",""),
        SIX(6, "","","","","","")
        //续保通知
        SIX(6, "","","","","",""),
        //商户端 委托保 - 投保待审核 加减保 换厂 待审核
        SEVEN(7, "待审核","待审核","待审核","","",""),
        EIGHT(8, "","","","","",""),
        NINE(9, "","","","","",""),
        ;

        // 成员变量
@@ -1372,9 +1381,9 @@
        RETURN_APPLY_SIGNATURE(4, "发起退回申请（已签章）"),
        PLATFORM_AGREE(5, "平台同意（已退回）"),
        CLOSE(6, "已关闭"),
        PALTFORM_CHECK_PASS(7, "审核通过"),
        CHECHED_PASSED(7, "审核通过"),
        PALTFORM_CHECK_PASS_NO(8, "审核不通过"),
        COMPANY_SIGN(9, "企业签署人员名单 - 委托保"),
        WTB_TOUBAOING(9, "投保中"),
        ;
        // 成员变量
        private String name;