20221108 基础配置 险种列表增加搜索条件

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

@@ -3,6 +3,7 @@ package com.yifu.cloud.plus.v1.yifu.insurances.vo;
 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 io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import java.util.List;
@@ -18,6 +19,7 @@ public class InsuranceTypeVo extends TInsuranceType {
 	/**
 	 * 所属保险公司名称
 	 */
+	@Schema(description = "所属保险公司名称")
 	private String insuranceCompanyName;
 
 	/**

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

@@ -39,7 +39,7 @@ public class TInsuranceTypeController {
 	 */
 	@Operation(summary = "分页查询", description = "分页查询")
 	@GetMapping("/page" )
-	public R<IPage<InsuranceTypeVo>> getInsuranceTypePage(Page<TInsuranceType> page,TInsuranceType insuranceType) {
+	public R<IPage<InsuranceTypeVo>> getInsuranceTypePage(Page<InsuranceTypeVo> page,InsuranceTypeVo insuranceType) {
 		return R.ok(insuranceTypeService.pageDiy(page, insuranceType));
 	}
 

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

@@ -44,9 +44,9 @@ public interface TInsuranceTypeMapper extends BaseMapper<TInsuranceType> {
 	 * @author zhaji
 	 * @param page 分页参数
 	 * @param insuranceType 查询参数
-	 * @return {@link IPage< InsuranceTypeVo>}
+	 * @return {@link IPage<InsuranceTypeVo>}
 	 */
-    IPage<InsuranceTypeVo> selectInsuranceTypePage(Page page, @Param("insuranceType") TInsuranceType insuranceType);
+    IPage<InsuranceTypeVo> selectInsuranceTypePage(Page page, @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

@@ -22,9 +22,9 @@ public interface TInsuranceTypeService extends IService<TInsuranceType> {
 	 * @author zhaji
 	 * @param page 分页参数
 	 * @param insuranceType 分页查询参数
-	 * @return {@link IPage< TInsuranceType>}
+	 * @return {@link IPage<InsuranceTypeVo>}
 	 */
-	IPage<InsuranceTypeVo> pageDiy(Page<TInsuranceType> page,TInsuranceType insuranceType);
+	IPage<InsuranceTypeVo> pageDiy(Page<InsuranceTypeVo> page,InsuranceTypeVo insuranceType);
 
 	/**
 	 * 新增险种信息

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

@@ -46,10 +46,10 @@ public class TInsuranceTypeServiceImpl extends ServiceImpl<TInsuranceTypeMapper,
 	 * @author zhaji
 	 * @param page 分页参数
 	 * @param insuranceType 分页查询参数
-	 * @return {@link IPage< TInsuranceType>}
+	 * @return {@link IPage<InsuranceTypeVo>}
 	 */
 	@Override
-	public IPage<InsuranceTypeVo> pageDiy(Page<TInsuranceType> page, TInsuranceType insuranceType) {
+	public IPage<InsuranceTypeVo> pageDiy(Page<InsuranceTypeVo> page, InsuranceTypeVo insuranceType) {
 		return this.baseMapper.selectInsuranceTypePage(page,insuranceType);
 	}
 

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

@@ -71,6 +71,12 @@
 			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 = #{insuranceType.name}
+		</if>
 		ORDER BY a.CREATE_TIME DESC
 	</select>
     <select id="getInsuranceTypeDetailById" resultType="com.yifu.cloud.plus.v1.yifu.insurances.vo.InsuranceTypeVo">