huych-商险产品-险种-新增/编辑处增加“是否地市自购”标签

yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/entity/TInsuranceDetail.java

@@ -397,5 +397,11 @@ public class TInsuranceDetail extends BaseEntity {
 	@Schema(description = "消息提醒备注")
 	private String expireRemark;
 
+	/**
+	 * 是否地市自购0是 1 否
+	 */
+	@Schema(description = "是否地市自购")
+	private String isAdress;
+
 	private static final long serialVersionUID = 1L;
 }
\ No newline at end of file

yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/entity/TInsuranceType.java

@@ -79,4 +79,10 @@ public class TInsuranceType extends BaseEntity {
 	@Schema(description = "是否删除 0否/1是")
     private Integer deleteFlag;
 
+	/**
+	 * 是否地市自购0是 1 否
+	 */
+	@Schema(description = "是否地市自购")
+	private String isAdress;
+
 }
\ No newline at end of file

yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/vo/InsuranceAddParam.java

@@ -196,4 +196,10 @@ public class InsuranceAddParam  implements Serializable {
 
 	@Schema(description ="客户编码")
 	private String unitNo;
+
+	/**
+	 * 是否地市自购0是 1 否
+	 */
+	@Schema(description = "是否地市自购")
+	private String isAdress;
 }

yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/vo/InsuranceBatchParam.java

@@ -203,4 +203,10 @@ public class InsuranceBatchParam implements Serializable {
 
 	@Schema(description ="客户编码")
 	private String unitNo;
+
+	/**
+	 * 是否地市自购0是 1 否
+	 */
+	@Schema(description = "是否地市自购")
+	private String isAdress;
 }

yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/vo/InsuranceDetailVO.java

@@ -406,4 +406,10 @@ public class InsuranceDetailVO implements Serializable {
 	 */
 	@Schema(description = "消息提醒备注")
 	private String expireRemark;
+
+	/**
+	 * 是否地市自购0是 1 否
+	 */
+	@Schema(description = "是否地市自购")
+	private String isAdress;
 }

yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/vo/InsuranceExportListOneVO.java

@@ -176,4 +176,9 @@ public class InsuranceExportListOneVO implements Serializable {
 	@Schema(description = "封面抬头")
 	private String invoiceTitle;
 
+	/**
+	 * 是否地市自购0是 1 否
+	 */
+	@Schema(description = "是否地市自购")
+	private String isAdress;
 }

yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/vo/InsuranceExportListVO.java

@@ -188,4 +188,10 @@ public class InsuranceExportListVO implements Serializable {
 	@Schema(description = "封面抬头")
 	private String invoiceTitle;
 
+	/**
+	 * 是否地市自购0是 1 否
+	 */
+	@Schema(description = "是否地市自购")
+	private String isAdress;
+
 }

yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/vo/InsuranceListVO.java

@@ -2,8 +2,6 @@ package com.yifu.cloud.plus.v1.yifu.insurances.vo;
 
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.write.style.HeadFontStyle;
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -171,4 +169,10 @@ public class InsuranceListVO implements Serializable {
 	 */
 	@Schema(description = "是否有效 0有效 1无效")
 	private Integer isEffect;
+
+	/**
+	 * 是否地市自购0是 1 否
+	 */
+	@Schema(description = "是否地市自购")
+	private String isAdress;
 }

yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/vo/InsuranceRefundListVo.java

@@ -215,4 +215,10 @@ public class InsuranceRefundListVo implements Serializable {
 	 */
 	@Schema(description = "是否有效 0有效 1无效")
 	private Integer isEffect;
+
+	/**
+	 * 是否地市自购0是 1 否
+	 */
+	@Schema(description = "是否地市自购")
+	private String isAdress;
 }

yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/vo/InsuranceReplaceParam.java

@@ -133,4 +133,10 @@ public class InsuranceReplaceParam implements Serializable {
 	@Schema(description ="客户编码")
 	private String unitNo;
 
+	/**
+	 * 是否地市自购0是 1 否
+	 */
+	@Schema(description = "是否地市自购")
+	private String isAdress;
+
 }

yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/vo/InsuranceTypeExportVo.java

+package com.yifu.cloud.plus.v1.yifu.insurances.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+/**
+ * @author huych
+ * @description 险种信息返回类
+ * @date 2024-10-30 10:26:33
+ */
+@Data
+public class InsuranceTypeExportVo {
+
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 险种名称
+	 */
+	@Schema(description = "险种名称")
+	private String name;
+
+	/**
+	 * 所属保险公司名称
+	 */
+	@Schema(description = "所属保险公司名称")
+	private String insuranceCompanyName;
+
+	/**
+	 * 收款银行名称
+	 */
+	@Schema(description = "收款银行名称")
+	private String bankName;
+
+	/**
+	 * 收款银行账号
+	 */
+	@Schema(description = "收款银行账号")
+	private String bankNo;
+
+	/**
+	 * 收款单位名称
+	 */
+	@Schema(description = "收款单位名称")
+	private String receiptUnitName;
+
+	/**
+	 * 购买年龄限制 0 限制  1 不限制
+	 */
+	@Schema(description = "购买年龄限制")
+	private String ageLimit;
+
+	/**
+	 * 是否地市自购0是 1 否
+	 */
+	@Schema(description = "是否地市自购")
+	private String isAdress;
+
+
+}

yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/vo/InsuredListVo.java

@@ -400,4 +400,12 @@ public class InsuredListVo implements Serializable {
 	@HeadFontStyle(fontHeightInPoints = 11)
 	@ExcelProperty(value = "替换人封面抬头")
 	private String replaceInvoiceTitle;
+
+	/**
+	 * 是否地市自购0是 1 否
+	 */
+	@Schema(description = "是否地市自购")
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty(value = "是否地市自购")
+	private String isAdress;
 }

yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/vo/RefundExportListVo.java

@@ -222,4 +222,10 @@ public class RefundExportListVo implements Serializable {
 	@JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd HH:mm:ss")
 	@Schema(description = "派单日期")
 	private LocalDateTime createTime;
+
+	/**
+	 * 是否地市自购0是 1 否
+	 */
+	@Schema(description = "是否地市自购")
+	private String isAdress;
 }

yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/controller/TInsuranceTypeController.java

@@ -43,6 +43,17 @@ public class TInsuranceTypeController {
 		return R.ok(insuranceTypeService.pageDiy(page, insuranceType));
 	}
 
+	/**
+	 * 导出查询
+	 * @param insuranceType 险种
+	 * @return
+	 */
+	@Operation(summary = "导出查询", description = "导出查询")
+	@PostMapping("/export" )
+	public R exportInsuranceType(InsuranceTypeVo insuranceType) {
+		return R.ok(insuranceTypeService.selectInsuranceType(insuranceType));
+	}
+
 	/**
 	 * 新增险种
 	 * @param insuranceType 险种明细

yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/mapper/insurances/TInsuranceTypeMapper.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceType;
 import com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceTypeRate;
 import com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceTypeStandard;
+import com.yifu.cloud.plus.v1.yifu.insurances.vo.InsuranceTypeExportVo;
 import com.yifu.cloud.plus.v1.yifu.insurances.vo.InsuranceTypeVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -48,6 +49,8 @@ public interface TInsuranceTypeMapper extends BaseMapper<TInsuranceType> {
 	 */
     IPage<InsuranceTypeVo> selectInsuranceTypePage(Page page, @Param("insuranceType") InsuranceTypeVo insuranceType);
 
+	List<InsuranceTypeExportVo> selectInsuranceType(@Param("insuranceType") InsuranceTypeVo insuranceType);
+
 	InsuranceTypeVo getInsuranceTypeDetailById(String id);
 
 }

yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/insurance/TInsuranceTypeService.java

@@ -26,6 +26,13 @@ public interface TInsuranceTypeService extends IService<TInsuranceType> {
 	 */
 	IPage<InsuranceTypeVo> pageDiy(Page<InsuranceTypeVo> page,InsuranceTypeVo insuranceType);
 
+	/**
+	 * 险种批量导出
+	 * @author huych
+	 * @param insuranceType 查询参数
+	 */
+	R selectInsuranceType(InsuranceTypeVo insuranceType);
+
 	/**
 	 * 新增险种信息
 	 *

yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/insurance/impl/TInsuranceDetailServiceImpl.java

@@ -2846,6 +2846,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 						listResult.add(param);
 						continue;
 					}
+					param.setIsAdress(insuranceType.getIsAdress());
 					//购买标准
 					TInsuranceTypeStandard typeStandard = tInsuranceTypeStandardService.getOne(Wrappers.<TInsuranceTypeStandard>query().lambda()
 							.eq(TInsuranceTypeStandard::getBuyStandard, param.getBuyStandard())
@@ -3216,6 +3217,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 						listResult.add(param);
 						continue;
 					}
+					param.setIsAdress(insuranceType.getIsAdress());
 					//购买标准
 					TInsuranceTypeStandard typeStandard = tInsuranceTypeStandardService.getOne(Wrappers.<TInsuranceTypeStandard>query().lambda()
 							.eq(TInsuranceTypeStandard::getBuyStandard, param.getBuyStandard())
@@ -3420,13 +3422,16 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 						.eq(TInsuranceType::getDeleteFlag, CommonConstants.ZERO_INT)
 						.last(CommonConstants.LAST_ONE_SQL)
 				);
-				if (Optional.ofNullable(insuranceType).isPresent() && CommonConstants.ZERO_STRING.equals(
-						insuranceType.getAgeLimit()) && (IdCardUtil.getFullAge(param.getEmpIdcardNo())
-						< CommonConstants.SIXTEEN_INT || IdCardUtil.getFullAge(param.getEmpIdcardNo())
-						> CommonConstants.SEVENTY)) {
-					param.setErrorMessage(InsurancesConstants.REPLACE_EMP_AGE_NOT_LEGITIMATE);
-					listResult.add(param);
-					continue;
+				if (Optional.ofNullable(insuranceType).isPresent()) {
+					param.setIsAdress(insuranceType.getIsAdress());
+					if (CommonConstants.ZERO_STRING.equals(
+							insuranceType.getAgeLimit()) && (IdCardUtil.getFullAge(param.getEmpIdcardNo())
+							< CommonConstants.SIXTEEN_INT || IdCardUtil.getFullAge(param.getEmpIdcardNo())
+							> CommonConstants.SEVENTY)) {
+						param.setErrorMessage(InsurancesConstants.REPLACE_EMP_AGE_NOT_LEGITIMATE);
+						listResult.add(param);
+						continue;
+					}
 				}
 			}
 

yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/insurance/impl/TInsuranceTypeServiceImpl.java

@@ -53,6 +53,16 @@ public class TInsuranceTypeServiceImpl extends ServiceImpl<TInsuranceTypeMapper,
 		return this.baseMapper.selectInsuranceTypePage(page,insuranceType);
 	}
 
+	/**
+	 * 险种批量导出
+	 * @author huych
+	 * @param insuranceType 查询参数
+	 */
+	@Override
+	public R selectInsuranceType(InsuranceTypeVo insuranceType) {
+		return R.ok(baseMapper.selectInsuranceType(insuranceType));
+	}
+
 	/**
 	 * 新增险种信息
 	 *

yifu-insurances/yifu-insurances-biz/src/main/resources/mapper/insurances/TInsuranceDetailMapper.xml

@@ -70,6 +70,7 @@
 			<result property="sincomeCollectFlag" column="SINCOME_COLLECT_FLAG"/>
 			<result property="spaySettleFlag" column="SPAY_COLLECT_FLAG"/>
 			<result property="spayCollectFlag" column="SPAY_SETTLE_FLAG"/>
+			<result property="isAdress" column="IS_ADRESS" jdbcType="VARCHAR"/>
 	</resultMap>
 	<resultMap id="UpdateMap" type="com.yifu.cloud.plus.v1.yifu.insurances.vo.InsuranceUpdateVO">
 		<id property="id" column="ID" jdbcType="VARCHAR"/>
@@ -89,7 +90,7 @@
         IS_USE,IS_EFFECT,IS_OVERDUE,REMARK,
         CREATE_BY,CREATE_NAME,CREATE_TIME,BPO_FLAG,
         UPDATE_BY,UPDATE_TIME,DELETE_FLAG,DEFAULT_SETTLE_ID,HANDLED_BY,HANDLED_TIME,ORDER_NO,CREATE_USER_DEPT_ID,CREATE_USER_DEPT_NAME,
-		DEPT_NAME,UNIT_ID,UNIT_NAME,UNIT_NO
+		DEPT_NAME,UNIT_ID,UNIT_NAME,UNIT_NO,IS_ADRESS
 
 
 	</sql>
@@ -117,7 +118,8 @@
 		a.CREATE_TIME as createTime,
 		a.UNIT_NAME as unitName,
 		a.UNIT_NO as unitNo,
-		a.IS_EFFECT as isEffect
+		a.IS_EFFECT as isEffect,
+		a.IS_ADRESS as isAdress
 		from t_insurance_detail a
 		where a.DELETE_FLAG = 0
 		<if test="param.isEffect != null">
@@ -195,7 +197,8 @@
 		a.REDUCE_HANDLE_STATUS as reduceHandleStatus,
 		if(a.BUY_HANDLE_STATUS=4,a.BACK_REMARK,'') as backRemark,
 		a.CREATE_TIME as createTime,
-		a.IS_EFFECT as isEffect
+		a.IS_EFFECT as isEffect,
+		a.IS_ADRESS as isAdress
 		from t_insurance_detail a
 		where a.DELETE_FLAG = 0
 		<if test="param.isEffect != null">
@@ -260,7 +263,8 @@
 		a.BUY_HANDLE_STATUS as buyHandleStatus,
 		a.SETTLE_TYPE as settleType,
 		a.SETTLE_MONTH as settleMonth,
-		a.DEPT_NAME as projectName
+		a.DEPT_NAME as projectName,
+		a.IS_ADRESS as isAdress
 		from t_insurance_detail a
 		where a.DELETE_FLAG = 0
 		<if test="param.deptNo != null and param.deptNo.trim() != ''">
@@ -357,7 +361,8 @@
 		a.RATE as  rate,
 	    a.REFUND_ID as  refundId,
 		a.EXPIRE_REMARK,
-		a.EXPIRE_IGNORE_FLAG
+		a.EXPIRE_IGNORE_FLAG,
+		a.IS_ADRESS as isAdress
 		from t_insurance_detail a
 		left join t_insurance_settle tis on a.DEFAULT_SETTLE_ID = tis.ID
 		where a.ID = #{id}
@@ -389,7 +394,8 @@
 		a.SETTLE_TYPE as settleType,
 		a.CREATE_NAME as createName,
 		a.POLICY_NO as policyNo,
-		a.REMARK as remark
+		a.REMARK as remark,
+		a.IS_ADRESS as isAdress
 		from t_insurance_detail a
 		where a.DELETE_FLAG = 0 and a.id in
 		<foreach collection="idList" index="index" item="item" open="(" separator="," close=")">
@@ -423,7 +429,8 @@
 			a.SETTLE_TYPE as settleType,
 			a.CREATE_NAME as createName,
 			a.POLICY_NO as policyNo,
-			a.REMARK as remark
+			a.REMARK as remark,
+			a.IS_ADRESS as isAdress
 		from t_insurance_detail a
 		where a.DELETE_FLAG = 0 and a.BUY_HANDLE_STATUS = #{param.buyHandleStatus}
 		<if test="param.empName != null and param.empName.trim() != ''">
@@ -486,7 +493,8 @@
 		a.SETTLE_TYPE as settleType,
 		a.CREATE_NAME as createName,
 		a.POLICY_NO as policyNo,
-		a.REMARK as remark
+		a.REMARK as remark,
+		a.IS_ADRESS as isAdress
 		from t_insurance_detail a
 		where a.DELETE_FLAG = 0 and a.id in
 		<foreach collection="idList" index="index" item="item" open="(" separator="," close=")">
@@ -518,7 +526,8 @@
 		a.SETTLE_TYPE as settleType,
 		a.CREATE_NAME as createName,
 		a.POLICY_NO as policyNo,
-		a.REMARK as remark
+		a.REMARK as remark,
+		a.IS_ADRESS as isAdress
 		from t_insurance_detail a
 		where a.DELETE_FLAG = 0 and a.BUY_HANDLE_STATUS = #{param.buyHandleStatus}
 		<if test="param.empName != null and param.empName.trim() != ''">
@@ -594,7 +603,8 @@
 			a.CREATE_TIME as createTime,
 			a.CREATE_NAME as createName,
 			a.UNIT_NAME as unitName,
-			a.UNIT_NO as unitNo
+			a.UNIT_NO as unitNo,
+			a.IS_ADRESS as isAdress
 		from
 		     t_insurance_detail a
 		where
@@ -700,7 +710,8 @@
 			a.CREATE_TIME as createTime,
 			a.CREATE_NAME as createName,
 			a.UNIT_NAME as unitName,
-			a.UNIT_NO as unitNo
+			a.UNIT_NO as unitNo,
+			a.IS_ADRESS as isAdress
 		from
 		    t_insurance_detail a
 		where
@@ -879,7 +890,8 @@
 			refund.CREATE_USER_DEPT_NAME as createUserDeptName,
 			refund.CREATE_TIME as refundCreateTime,
 			a.CREATE_TIME as createTime,
-		       a.IS_EFFECT as isEffect
+		    a.IS_EFFECT as isEffect,
+			a.IS_ADRESS as isAdress
 		from
 			t_insurance_detail a,
 			t_insurance_refund refund
@@ -965,7 +977,8 @@
 			a.DIE_DISABLE_QUOTA as dieDisableQuota,
 			a.CREATE_NAME as createName,
 			refund.CREATE_TIME as refundCreateTime,
-			a.IS_EFFECT as isEffect
+			a.IS_EFFECT as isEffect,
+			a.IS_ADRESS as isAdress
 		from
 			t_insurance_detail a,
 			t_insurance_refund refund
@@ -1050,7 +1063,8 @@
 		a.DIE_DISABLE_QUOTA as dieDisableQuota,
 		refund.CREATE_TIME as createTime,
 		refund.CREATE_NAME as createName,
-		a.REDUCE_HANDLE_STATUS as reduceHandleStatus
+		a.REDUCE_HANDLE_STATUS as reduceHandleStatus,
+		a.IS_ADRESS as isAdress
 		from
 			t_insurance_detail a,
 			t_insurance_refund refund
@@ -1164,7 +1178,8 @@
 			a.POLICY_NO as policyNo,
 			refund.CREATE_NAME as createName,
 			a.REDUCE_HANDLE_STATUS as reduceHandleStatus,
-			refund.REMARK as remark
+			refund.REMARK as remark,
+			a.IS_ADRESS as isAdress
 		from
 		    t_insurance_detail a,
 			t_insurance_refund refund
@@ -1201,7 +1216,8 @@
 			a.SETTLE_TYPE as settleType,
 			refund.CREATE_NAME as createName,
 			a.POLICY_NO as policyNo,
-			refund.REMARK as remark
+			refund.REMARK as remark,
+			a.IS_ADRESS as isAdress
 		from
 			t_insurance_detail a,
 			t_insurance_refund refund

yifu-insurances/yifu-insurances-biz/src/main/resources/mapper/insurances/TInsuranceTypeMapper.xml

@@ -17,13 +17,14 @@
             <result property="createTime" column="CREATE_TIME" jdbcType="TIMESTAMP"/>
             <result property="updateBy" column="UPDATE_BY" jdbcType="VARCHAR"/>
             <result property="updateTime" column="UPDATE_TIME" jdbcType="TIMESTAMP"/>
+			<result property="isAdress" column="IS_ADRESS" jdbcType="VARCHAR"/>
     </resultMap>
 
     <sql id="Base_Column_List">
         ID,NAME,INSURANCE_COMPANY_ID,
         RECEIPT_UNIT_NAME,BANK_NAME,BANK_NO,
         DELETE_FLAG,CREATE_BY,CREATE_NAME,
-        CREATE_TIME,UPDATE_BY,UPDATE_TIME
+        CREATE_TIME,UPDATE_BY,UPDATE_TIME,IS_ADRESS
     </sql>
 	<select id="selectInsuranceTypeRateList" resultType="com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceTypeRate">
 		select
@@ -64,7 +65,8 @@
 			a.RECEIPT_UNIT_NAME as receiptUnitName,
 			a.BANK_NAME as bankName,
 			a.BANK_NO as bankNo,
-			a.AGE_LIMIT as ageLimit
+			a.AGE_LIMIT as ageLimit,
+			a.IS_ADRESS as isAdress
 		from
 			t_insurance_type a,
 			t_insurance_company b
@@ -80,6 +82,33 @@
 		</if>
 		ORDER BY a.CREATE_TIME DESC
 	</select>
+
+	<select id="selectInsuranceType" resultType="com.yifu.cloud.plus.v1.yifu.insurances.vo.InsuranceTypeExportVo">
+		select
+		a.NAME  as name ,
+		b.COMPANY_NAME as insuranceCompanyName,
+		a.BANK_NAME as bankName,
+		a.BANK_NO as bankNo,
+		a.RECEIPT_UNIT_NAME as receiptUnitName,
+		if(a.AGE_LIMIT = '0','限制（16-70岁）','无') as ageLimit,
+		if(a.IS_ADRESS = '0','是','否') as isAdress
+		from
+		t_insurance_type a,
+		t_insurance_company b
+		where
+		a.INSURANCE_COMPANY_ID = b.ID
+		and
+		a.DELETE_FLAG = 0
+		<if test="insuranceType.insuranceCompanyName != null and insuranceType.insuranceCompanyName.trim() != ''">
+			and b.COMPANY_NAME = #{insuranceType.insuranceCompanyName}
+		</if>
+		<if test="insuranceType.name != null and insuranceType.name.trim() != ''">
+			and a.NAME like concat('%',replace(replace(#{insuranceType.name},'_','\_'),'%','\%'),'%')
+		</if>
+		ORDER BY a.CREATE_TIME DESC
+	</select>
+
+
     <select id="getInsuranceTypeDetailById" resultType="com.yifu.cloud.plus.v1.yifu.insurances.vo.InsuranceTypeVo">
 		select
 			a.ID  as id,
@@ -89,7 +118,8 @@
 			a.RECEIPT_UNIT_NAME as receiptUnitName,
 			a.BANK_NAME as bankName,
 			a.BANK_NO as bankNo,
-			a.AGE_LIMIT as ageLimit
+			a.AGE_LIMIT as ageLimit,
+			a.IS_ADRESS as isAdress
 		from
 			t_insurance_type a,
 			t_insurance_company b