Merge remote-tracking branch 'origin/master'

jiangping

2024-02-04 4f2a2b480f1d36782c315881bad50066a52e71aa

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

@@ -635,8 +635,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 +678,7 @@
    }

    public  enum ApplyCollectStatus {
        DSP(0, "待审批"),
        DSP(0, "待审核"),
        DCD(1, "待出单"),
        BZZ(2, "保障中"),
        YGQ(3, "已过期"),
@@ -822,7 +822,7 @@
        COMPANY_BACK_APPLY_WAIT_SIGNATURE(7, "企业申请退回(待签章)","提交意见：${param}",5),
        COMPANY_BACK_APPLY_SIGNATURE(8, "企业申请退回(已签章)","提交意见：${param}",5),
        CLOSE(9, "订单关闭","",6),
        PLATFORM_CHECK_PASS(10,"平台投保审核通过","提交意见：${param}",1),
        PLATFORM_CHECK_PASS(10,"平台投保审核通过","提交意见：${param}",0),
        ;
        // 成员变量
        private String name;
@@ -910,6 +910,181 @@
        }
    }


    public  enum NoticeObjectType {
        INSURANCE_APPLY(0, "投保申请","保险方案"),
        APPLY_CHANGE(1, "加减保申请","保险方案"),
        CHANGE_FACTORY(2, "员工换厂申请","保险方案"),
        DISPATCH_UNIT(3, "派遣单位申请","派遣单位"),
        TAXES(4, "开票申请","开票金额"),
        SETTLE_CLAIMS(5, "报案理赔","报案人")
        ;
        // 成员变量
        private int key;
        private String name;
        private String info;

        // 构造方法
        NoticeObjectType(int key, String name,String info) {
            this.name = name;
            this.key = key;
            this.info = info;
        }

        // 普通方法
        public static String getName(int index) {
            for (NoticeObjectType c : NoticeObjectType.values()) {
                if (c.getKey() == index) {
                    return c.name;
                }
            }
            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 NoticeType {

        ZERO(0, "待审核","","","待审核","已申请","待受理"),
        ONE(1, "企业待签署","","","工种待审核","","完成受理"),
        TWO(2, "待出单","待审核","待审核","","",""),
        THREE(3, "申请退回","申请退回","申请退回","","",""),
        FOUR(4, "已退回","已退回","已退回","","",""),
        FIVE(5, "申请驳回","申请驳回","申请驳回","","","")
        ;

        // 成员变量
        private int status;
        private String insuranceApplyDetail;
        private String applyChangeDetail;
        private String changeFactoryDetail;
        private String dispatchUnitDetail;
        private String taxesDetail;
        private String settleClaimsDetail;

        // 构造方法
        NoticeType(int status, String insuranceApplyDetail,String applyChangeDetail
                , String changeFactoryDetail,String dispatchUnitDetail
                , String taxesDetail,String settleClaimsDetail) {
            this.status = status;
            this.insuranceApplyDetail = insuranceApplyDetail;
            this.applyChangeDetail = applyChangeDetail;
            this.changeFactoryDetail = changeFactoryDetail;
            this.dispatchUnitDetail = dispatchUnitDetail;
            this.taxesDetail = taxesDetail;
            this.settleClaimsDetail = settleClaimsDetail;
        }

        // 普通方法
        public static String getDetail(int status,int type) {
            for (NoticeType c : NoticeType.values()) {
                if (c.getStatus() == status) {
                    if(type==NoticeObjectType.INSURANCE_APPLY.getKey() ){
                        return c.getInsuranceApplyDetail();
                    }else if(type == NoticeObjectType.APPLY_CHANGE.getKey()){
                        return c.getApplyChangeDetail();
                    }else if(type == NoticeObjectType.CHANGE_FACTORY.getKey()){
                        return c.getChangeFactoryDetail();
                    }else if(type == NoticeObjectType.DISPATCH_UNIT.getKey()){
                        return c.getDispatchUnitDetail();
                    }else if(type == NoticeObjectType.TAXES.getKey()){
                        return c.getTaxesDetail();
                    }else if(type == NoticeObjectType.SETTLE_CLAIMS.getKey()){
                        return c.getSettleClaimsDetail();
                    }
                }
            }
            return null;
        }

        // get set 方法
        public int getStatus() {
            return status;
        }

        public void setStatus(int status) {
            this.status = status;
        }

        public String getInsuranceApplyDetail() {
            return insuranceApplyDetail;
        }

        public void setInsuranceApplyDetail(String name) {
            this.insuranceApplyDetail = insuranceApplyDetail;
        }

        public String getApplyChangeDetail() {
            return applyChangeDetail;
        }

        public void setApplyChangeDetail(String info) {
            this.applyChangeDetail = applyChangeDetail;
        }

        public String getChangeFactoryDetail() {
            return changeFactoryDetail;
        }

        public void setChangeFactoryDetail(String info) {
            this.changeFactoryDetail = changeFactoryDetail;
        }

        public String getDispatchUnitDetail() {
            return dispatchUnitDetail;
        }

        public void setDispatchUnitDetail(String info) {
            this.dispatchUnitDetail = dispatchUnitDetail;
        }

        public String getTaxesDetail() {
            return taxesDetail;
        }

        public void setTaxesDetail(String info) {
            this.taxesDetail = taxesDetail;
        }

        public String getSettleClaimsDetail() {
            return settleClaimsDetail;
        }

        public void setSettleClaimsDetail(String info) {
            this.settleClaimsDetail = settleClaimsDetail;
        }


    }


    public static BigDecimal countDetailFee(Solutions solutions,Date startDate, Date endDate){
        //查询保险实际周期
        Integer cycle = DateUtil.calculateBetween(endDate,startDate,solutions.getTimeUnit());
@@ -932,7 +1107,7 @@
    public  enum ApplyChangeStatus {
        UPLOAD(0, "提交加减保/换厂申请"),
        SIGNATURE(1, "已签章"),
        APPROVE(2, "已上传审批"),
        APPROVE(2, "已上传审核"),
        RETURN_APPLY_UPLOAD(3, "发起退回申请(待审核)"),
        RETURN_APPLY_SIGNATURE(4, "发起退回申请（已签章）"),
        PLATFORM_AGREE(5, "平台同意（已退回）"),
@@ -1102,8 +1277,8 @@
    public  enum ApplyChangeLogStatus {
        UPLOAD(0, "发起申请",""),
        RETURN_APPLY(3, "发起退回申请","提交意见：${param}"),
        PLATFORM_AGREE(4, "平台审批通过" ,"提交意见：${param}"),
        PLATFORM_UN_AGREE(0, "审批驳回","提交意见：${param}"),
        PLATFORM_AGREE(4, "平台审核通过" ,"提交意见：${param}"),
        PLATFORM_UN_AGREE(0, "审核驳回","提交意见：${param}"),
        CLOSE(5, "关闭",""),
        ;
        // 成员变量
@@ -1420,6 +1595,7 @@
                    }
                }
                zipOutputStream.closeArchiveEntry();
                file.delete();
            }
        }
    }