Commit 029aed9f authored by fangxinjiang's avatar fangxinjiang

商险规则-fxj

parent 1a952829
...@@ -76,6 +76,22 @@ public class TAutoInsurStandard extends BaseEntity { ...@@ -76,6 +76,22 @@ public class TAutoInsurStandard extends BaseEntity {
@ExcelProperty("险种") @ExcelProperty("险种")
@Schema(description = "险种,下拉选项") @Schema(description = "险种,下拉选项")
private String riskType; private String riskType;
/**
* 保险公司Id
*/
@ExcelAttribute(name = "保险公司Id", isNotEmpty = true, errorInfo = "保险公司Id不能为空")
@NotBlank(message = "保险公司Id不能为空")
@ExcelProperty("保险公司Id")
@Schema(description = "保险公司Id")
private String companyId;
/**
* 险种Id
*/
@ExcelAttribute(name = "险种Id", isNotEmpty = true, errorInfo = "险种Id不能为空")
@ExcelProperty("险种Id")
@Schema(description = "险种Id")
private String riskTypeId;
/** /**
* 购买标准,多值逗号分隔 * 购买标准,多值逗号分隔
*/ */
......
...@@ -64,4 +64,12 @@ public class TAutoStandardInfo { ...@@ -64,4 +64,12 @@ public class TAutoStandardInfo {
@Schema(description = "购买标准") @Schema(description = "购买标准")
private String standard; private String standard;
/**
* 购买标准ID
*/
@ExcelAttribute(name = "购买标准ID", isNotEmpty = true, errorInfo = "购买标准ID不能为空", maxLength = 32)
@ExcelProperty("购买标准ID")
@Schema(description = "购买标准ID")
private String standardId;
} }
...@@ -28,6 +28,8 @@ ...@@ -28,6 +28,8 @@
<result property="name" column="NAME"/> <result property="name" column="NAME"/>
<result property="company" column="COMPANY"/> <result property="company" column="COMPANY"/>
<result property="riskType" column="RISK_TYPE"/> <result property="riskType" column="RISK_TYPE"/>
<result property="companyId" column="COMPANY_ID"/>
<result property="riskTypeId" column="RISK_TYPE_ID"/>
<result property="standard" column="STANDARD"/> <result property="standard" column="STANDARD"/>
<result property="buyProvince" column="BUY_PROVINCE"/> <result property="buyProvince" column="BUY_PROVINCE"/>
<result property="buyCity" column="BUY_CITY"/> <result property="buyCity" column="BUY_CITY"/>
...@@ -53,7 +55,7 @@ ...@@ -53,7 +55,7 @@
a.CREATE_NAME, a.CREATE_NAME,
a.CREATE_TIME, a.CREATE_TIME,
a.UPDATE_BY, a.UPDATE_BY,
a.UPDATE_TIME a.UPDATE_TIME,a.COMPANY_ID,a.RISK_TYPE_ID
</sql> </sql>
<sql id="tAutoInsurStandard_where"> <sql id="tAutoInsurStandard_where">
<if test="tAutoInsurStandard != null"> <if test="tAutoInsurStandard != null">
...@@ -66,10 +68,16 @@ ...@@ -66,10 +68,16 @@
<if test="tAutoInsurStandard.company != null"> <if test="tAutoInsurStandard.company != null">
AND a.COMPANY = #{tAutoInsurStandard.company} AND a.COMPANY = #{tAutoInsurStandard.company}
</if> </if>
<if test="tAutoInsurStandard.riskType != null"> <if test="tAutoInsurStandard.riskType != null">
AND a.RISK_TYPE = #{tAutoInsurStandard.riskType} AND a.RISK_TYPE = #{tAutoInsurStandard.riskType}
</if> </if>
<if test="tAutoInsurStandard.standard != null and tAutoInsurStandard.standard.trim() != ''"> <if test="tAutoInsurStandard.riskTypeId != null">
AND a.RISK_TYPE_ID = #{tAutoInsurStandard.riskTypeId}
</if>
<if test="tAutoInsurStandard.companyId != null">
AND a.COMPANY_ID = #{tAutoInsurStandard.companyId}
</if>
<if test="tAutoInsurStandard.standard != null and tAutoInsurStandard.standard.trim() != ''">
AND a.STANDARD = #{tAutoInsurStandard.standard} AND a.STANDARD = #{tAutoInsurStandard.standard}
</if> </if>
<if test="tAutoInsurStandard.buyProvince != null"> <if test="tAutoInsurStandard.buyProvince != null">
......
...@@ -27,11 +27,13 @@ ...@@ -27,11 +27,13 @@
<id property="id" column="ID"/> <id property="id" column="ID"/>
<result property="mainId" column="MAIN_ID"/> <result property="mainId" column="MAIN_ID"/>
<result property="standard" column="STANDARD"/> <result property="standard" column="STANDARD"/>
<result property="standard" column="STANDARD_ID"/>
</resultMap> </resultMap>
<sql id="Base_Column_List"> <sql id="Base_Column_List">
a.ID, a.ID,
a.MAIN_ID, a.MAIN_ID,
a.STANDARD a.STANDARD,
a.STANDARD_ID
</sql> </sql>
<sql id="tAutoStandardInfo_where"> <sql id="tAutoStandardInfo_where">
<if test="tAutoStandardInfo != null"> <if test="tAutoStandardInfo != null">
...@@ -44,6 +46,9 @@ ...@@ -44,6 +46,9 @@
<if test="tAutoStandardInfo.standard != null"> <if test="tAutoStandardInfo.standard != null">
AND a.STANDARD = #{tAutoStandardInfo.standard} AND a.STANDARD = #{tAutoStandardInfo.standard}
</if> </if>
<if test="tAutoStandardInfo.standardId != null">
AND a.STANDARD_ID = #{tAutoStandardInfo.standardId}
</if>
</if> </if>
</sql> </sql>
<!--tAutoStandardInfo简单分页查询--> <!--tAutoStandardInfo简单分页查询-->
......
...@@ -15,6 +15,7 @@ import org.springframework.http.HttpHeaders; ...@@ -15,6 +15,7 @@ import org.springframework.http.HttpHeaders;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.util.List;
/** /**
* @author zhaji * @author zhaji
...@@ -41,6 +42,15 @@ public class TInsuranceTypeStandardController { ...@@ -41,6 +42,15 @@ public class TInsuranceTypeStandardController {
return insuranceTypeStandardService.getInsuranceTypeStandard(id); return insuranceTypeStandardService.getInsuranceTypeStandard(id);
} }
/**
* 根据险种ID查询购买标准列表
* @return
*/
@Operation(summary = "根据险种ID查询购买标准列表", description = "购买标准列表2 传参险种ID riskId")
@GetMapping("/listEnable" )
public R<List<TInsuranceTypeStandard>> getInsuranceTypeStandardList(String riskId) {
return insuranceTypeStandardService.getInsuranceTypeStandardList(riskId);
}
/** /**
* 删除购买标准信息 * 删除购买标准信息
* @param id 购买标准id * @param id 购买标准id
......
...@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.extension.service.IService; ...@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.extension.service.IService;
import com.yifu.cloud.plus.v1.yifu.common.core.util.R; import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
import com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceTypeStandard; import com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceTypeStandard;
import java.util.List;
/** /**
* @author Administrator * @author Administrator
* @description 针对表【t_insurance_type_standard(购买标准表)】的数据库操作Service * @description 针对表【t_insurance_type_standard(购买标准表)】的数据库操作Service
...@@ -38,4 +40,6 @@ public interface TInsuranceTypeStandardService extends IService<TInsuranceTypeSt ...@@ -38,4 +40,6 @@ public interface TInsuranceTypeStandardService extends IService<TInsuranceTypeSt
R saveInsuranceTypeStandard(TInsuranceTypeStandard insuranceTypeStandard); R saveInsuranceTypeStandard(TInsuranceTypeStandard insuranceTypeStandard);
R enableById(String id, String enable); R enableById(String id, String enable);
R<List<TInsuranceTypeStandard>> getInsuranceTypeStandardList(String riskId);
} }
...@@ -2,11 +2,13 @@ package com.yifu.cloud.plus.v1.yifu.insurances.service.insurance.impl; ...@@ -2,11 +2,13 @@ package com.yifu.cloud.plus.v1.yifu.insurances.service.insurance.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants; import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
import com.yifu.cloud.plus.v1.yifu.common.core.util.Common; import com.yifu.cloud.plus.v1.yifu.common.core.util.Common;
import com.yifu.cloud.plus.v1.yifu.common.core.util.R; import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
import com.yifu.cloud.plus.v1.yifu.common.core.vo.YifuUser; import com.yifu.cloud.plus.v1.yifu.common.core.vo.YifuUser;
import com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity;
import com.yifu.cloud.plus.v1.yifu.common.security.util.SecurityUtils; import com.yifu.cloud.plus.v1.yifu.common.security.util.SecurityUtils;
import com.yifu.cloud.plus.v1.yifu.insurances.constants.InsurancesConstants; import com.yifu.cloud.plus.v1.yifu.insurances.constants.InsurancesConstants;
import com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceOperate; import com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceOperate;
...@@ -192,4 +194,12 @@ public class TInsuranceTypeStandardServiceImpl extends ServiceImpl<TInsuranceTyp ...@@ -192,4 +194,12 @@ public class TInsuranceTypeStandardServiceImpl extends ServiceImpl<TInsuranceTyp
baseMapper.updateById(typeStandard); baseMapper.updateById(typeStandard);
return R.ok(); return R.ok();
} }
@Override
public R<List<TInsuranceTypeStandard>> getInsuranceTypeStandardList(String riskId) {
return R.ok(baseMapper.selectList(Wrappers.<TInsuranceTypeStandard>query().lambda()
.eq(TInsuranceTypeStandard::getInsuranceTypeId,riskId)
.eq(TInsuranceTypeStandard::getDeleteFlag,CommonConstants.ZERO_STRING)
.eq(TInsuranceTypeStandard::getEnable,CommonConstants.ZERO_STRING)));
}
} }
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