productDev/yunyibao.git

			@@ -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;
			@@ -546,7 +555,7 @@

			public static void main(String[] args) {

			System.out.println("hello&&devicenumber=22110002&&uuid=1e52008fb8ff\n".length());
			System.out.println("{\"companyName\":\"应宝科技\",\"endtime\":\"2024-03-01 17:19:00\",\"erpId\":\"4D40185D5BC74A13821BE46EAF8B4179\",\"erpWithVisitDTOList\":[],\"faceImg\":\"20240304/1709518170325_742.jpg\",\"idcardNo\":\"342501199609300535\",\"idcardType\":0,\"name\":\"黄晋\",\"phone\":\"17756328697\",\"reason\":\"探险\",\"receptMemberId\":\"E7E514BD7DE3F27CE0530B630A0AEAE0\",\"starttime\":\"2024-03-01 13:18:00\"}");
			}
			/**
			* 用户类型 0系统用户 1企业用户 2服务机构管理员 3服务机构子账号 4综合服务单位管理员 5综合服务单位子账号 6专家 7县区用户 8市局用户
			@@ -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, "投保审核通过","提交意见：${param}",0),
			UPLOAD_AGAIN(26, "再次投保","",0),
			PALTFORM_EDIT_BD(22, "修改保单","修改原因：${param}",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, "提交投保","",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),
			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 {
			@@ -823,6 +856,7 @@
			COMPANY_BACK_APPLY_SIGNATURE(8, "企业申请退回(已签章)","提交意见：${param}",5),
			CLOSE(9, "订单关闭","",6),
			PLATFORM_CHECK_PASS(10,"平台投保审核通过","提交意见：${param}",0),
			COMPANY_BACK_APPLY_PASS(11, "企业申请退回(平台投保审核通过)","提交意见：${param}",5),
			;
			// 成员变量
			private String name;
			@@ -972,12 +1006,13 @@

			public enum NoticeType {

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

			// 成员变量