Merge branch 'feature-licancan' into 'develop'

区域id校验

See merge request fangxinjiang/yifu!29

yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/ProjectSetInfoVo.java

@@ -2,6 +2,7 @@ package com.yifu.cloud.plus.v1.yifu.archives.vo;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
@@ -57,7 +58,7 @@ public class ProjectSetInfoVo implements Serializable {
 	 * 商险结算类型：0预估  1 实缴
 	 */
 	@Schema(description = "商险结算类型")
-	private String insuranceSettleType;
+	private String insuranceSettleType = CommonConstants.ONE_STRING;
 
 
 }

yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/constants/InsurancesConstants.java

@@ -144,18 +144,34 @@ public class InsurancesConstants {
 	 * 商险购买地省名称不能为空
 	 */
 	public static final String INSURANCE_PROVINCE_NAME_NOT_EMPTY = "商险购买地省名称不能为空";
+	/**
+	 * 商险购买地省名称不存在
+	 */
+	public static final String INSURANCE_PROVINCE_NAME_NOT_EXIST = "商险购买地省名称不存在";
 	/**
 	 * 商险购买地市名称
 	 */
 	public static final String INSURANCE_CITY_NAME_NOT_EMPTY = "商险购买地市名称不能为空";
+	/**
+	 * 商险购买地市名称不存在
+	 */
+	public static final String INSURANCE_CITY_NAME_NOT_EXIST = "商险购买地市名称不存在";
 	/**
 	 * 商险办理省名称不能为空
 	 */
 	public static final String INSURANCE_HANDLE_PROVINCE_NAME_NOT_EMPTY = "商险办理省名称不能为空";
+	/**
+	 * 商险办理省名称不存在
+	 */
+	public static final String INSURANCE_HANDLE_PROVINCE_NAME_NOT_EXIST = "商险办理省名称不存在";
 	/**
 	 * 商险办理城市名称不能为空
 	 */
 	public static final String INSURANCE_HANDLE_CITY_NAME_NOT_EMPTY = "商险办理城市名称不能为空";
+	/**
+	 * 商险办理城市名称不存在
+	 */
+	public static final String INSURANCE_HANDLE_CITY_NAME_NOT_EXIST = "商险办理城市名称不存在";
 	/**
 	 * 结算月不能为空
 	 */