Commit 3e2a3711 authored by fangxinjiang's avatar fangxinjiang

Merge remote-tracking branch 'origin/MVP1.7.1' into MVP1.7.1

parents 7e1ed015 83e90248
package com.yifu.cloud.plus.v1.yifu.insurances.vo; package com.yifu.cloud.plus.v1.yifu.insurances.vo;
import com.baomidou.mybatisplus.annotation.FieldStrategy;
import com.baomidou.mybatisplus.annotation.TableField;
import com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity; import com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data; import lombok.Data;
...@@ -120,4 +118,10 @@ public class InsuranceListParam extends BaseEntity { ...@@ -120,4 +118,10 @@ public class InsuranceListParam extends BaseEntity {
@Schema(description = "是否有效 0有效 1无效") @Schema(description = "是否有效 0有效 1无效")
private Integer isEffect; private Integer isEffect;
/**
* 是否地市自购0是 1 否
*/
@Schema(description = "是否地市自购")
private String isAdress;
} }
...@@ -50,8 +50,8 @@ public class TInsuranceTypeController { ...@@ -50,8 +50,8 @@ public class TInsuranceTypeController {
*/ */
@Operation(summary = "导出查询", description = "导出查询") @Operation(summary = "导出查询", description = "导出查询")
@PostMapping("/export" ) @PostMapping("/export" )
public R exportInsuranceType(InsuranceTypeVo insuranceType) { public R exportInsuranceType(@RequestBody InsuranceTypeVo insuranceType) {
return R.ok(insuranceTypeService.selectInsuranceType(insuranceType)); return insuranceTypeService.selectInsuranceType(insuranceType);
} }
/** /**
......
...@@ -94,7 +94,7 @@ ...@@ -94,7 +94,7 @@
a.BANK_NO as bankNo, a.BANK_NO as bankNo,
a.RECEIPT_UNIT_NAME as receiptUnitName, a.RECEIPT_UNIT_NAME as receiptUnitName,
if(a.AGE_LIMIT = '0','限制(16-70岁)','无') as ageLimit, if(a.AGE_LIMIT = '0','限制(16-70岁)','无') as ageLimit,
if(a.IS_ADRESS = '0','是','否') as isAdress if(a.IS_ADRESS = '0','是',if(ifnull(a.IS_ADRESS,3) = 3,'','否')) as isAdress
from from
t_insurance_type a, t_insurance_type a,
t_insurance_company b t_insurance_company b
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment