Commit 28350db6 authored by fangxinjiang's avatar fangxinjiang

商险增加替换标签和替换说明-fxj

parent 4ced80a2
...@@ -427,24 +427,36 @@ public class TInsuranceDetail extends BaseEntity { ...@@ -427,24 +427,36 @@ public class TInsuranceDetail extends BaseEntity {
private String isJfcd; private String isJfcd;
/** /**
* 购买周期 (格式:4个月/117天) * 购买周期(格式:4 个月/117 天)
*/ */
@Schema(description = "购买周期") @Schema(description = "购买周期")
private String purchaseCycle; private String purchaseCycle;
/** /**
* 预计办理日期 * 预计办理日期
*/ */
@Schema(description = "预计办理日期") @Schema(description = "预计办理日期")
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd") @JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd")
private LocalDate preHandleTime; private LocalDate preHandleTime;
/**
* 替换标签
*/
@Schema(description = "替换标签")
private String replaceTag;
/** /**
* 差额settleId * 可替换说明
*/
@Schema(description = "可替换说明")
private String replaceRemark;
/**
* 差额 settleId
*/ */
@TableField(exist = false) @TableField(exist = false)
@Schema(description = "差额settleId") @Schema(description = "差额 settleId")
private String balanceId; private String balanceId;
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
} }
\ No newline at end of file
...@@ -428,6 +428,22 @@ public class InsuredListVo implements Serializable { ...@@ -428,6 +428,22 @@ public class InsuredListVo implements Serializable {
@ExcelProperty(value = "备注") @ExcelProperty(value = "备注")
private String remark; private String remark;
/**
* 替换标签
*/
@Schema(description = "替换标签")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty(value = "替换标签")
private String replaceTag;
/**
* 可替换说明
*/
@Schema(description = "可替换说明")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty(value = "可替换说明")
private String replaceRemark;
@ExcelIgnore @ExcelIgnore
private String insuranceTypeId; private String insuranceTypeId;
} }
...@@ -171,4 +171,16 @@ public class InsuredParam extends BaseEntity implements Serializable { ...@@ -171,4 +171,16 @@ public class InsuredParam extends BaseEntity implements Serializable {
@Schema(description = "购买标准结束") @Schema(description = "购买标准结束")
private String buyStandardMax; private String buyStandardMax;
/**
* 替换标签
*/
@Schema(description = "替换标签")
private String replaceTag;
/**
* 可替换说明(支持模糊查询)
*/
@Schema(description = "可替换说明")
private String replaceRemark;
} }
...@@ -749,7 +749,8 @@ ...@@ -749,7 +749,8 @@
a.CREATE_NAME as createName, a.CREATE_NAME as createName,
a.UNIT_NAME as unitName, a.UNIT_NAME as unitName,
a.UNIT_NO as unitNo, a.UNIT_NO as unitNo,
a.IS_ADRESS as isAdress a.IS_ADRESS as isAdress,
a.REPLACE_TAG as replaceTag
from from
t_insurance_detail a t_insurance_detail a
where where
...@@ -821,6 +822,12 @@ ...@@ -821,6 +822,12 @@
<if test="param.isAdress != null and param.isAdress.trim() != ''"> <if test="param.isAdress != null and param.isAdress.trim() != ''">
and a.IS_ADRESS = #{param.isAdress} and a.IS_ADRESS = #{param.isAdress}
</if> </if>
<if test="param.replaceTag != null and param.replaceTag.trim() != ''">
and a.REPLACE_TAG = #{param.replaceTag}
</if>
<if test="param.replaceRemark != null and param.replaceRemark.trim() != ''">
and a.REPLACE_REMARK like concat('%',replace(replace(#{param.replaceRemark},'_','\\_'),'%','\\%'),'%')
</if>
<if test="param.authSql != null and param.authSql.trim() != ''"> <if test="param.authSql != null and param.authSql.trim() != ''">
${param.authSql} ${param.authSql}
</if> </if>
...@@ -859,7 +866,9 @@ ...@@ -859,7 +866,9 @@
a.CREATE_NAME as createName, a.CREATE_NAME as createName,
a.UNIT_NAME as unitName, a.UNIT_NAME as unitName,
a.UNIT_NO as unitNo, a.UNIT_NO as unitNo,
if(a.IS_ADRESS = '0','是',if(ifnull(a.IS_ADRESS,3) = 3,'','否')) as isAdress,a.remark if(a.IS_ADRESS = '0','是',if(ifnull(a.IS_ADRESS,3) = 3,'','否')) as isAdress,a.remark,
a.REPLACE_TAG as replaceTag,
a.REPLACE_REMARK as replaceRemark
from from
t_insurance_detail a t_insurance_detail a
where where
...@@ -936,6 +945,12 @@ ...@@ -936,6 +945,12 @@
<if test="param.isAdress != null and param.isAdress.trim() != ''"> <if test="param.isAdress != null and param.isAdress.trim() != ''">
and a.IS_ADRESS = #{param.isAdress} and a.IS_ADRESS = #{param.isAdress}
</if> </if>
<if test="param.replaceTag != null and param.replaceTag.trim() != ''">
and a.REPLACE_TAG = #{param.replaceTag}
</if>
<if test="param.replaceRemark != null and param.replaceRemark.trim() != ''">
and a.REPLACE_REMARK like concat('%',replace(replace(#{param.replaceRemark},'_','\\_'),'%','\\%'),'%')
</if>
<if test="param.authSql != null and param.authSql.trim() != ''"> <if test="param.authSql != null and param.authSql.trim() != ''">
${param.authSql} ${param.authSql}
</if> </if>
...@@ -1019,6 +1034,12 @@ ...@@ -1019,6 +1034,12 @@
<if test="param.isAdress != null and param.isAdress.trim() != ''"> <if test="param.isAdress != null and param.isAdress.trim() != ''">
and a.IS_ADRESS = #{param.isAdress} and a.IS_ADRESS = #{param.isAdress}
</if> </if>
<if test="param.replaceTag != null and param.replaceTag.trim() != ''">
and a.REPLACE_TAG = #{param.replaceTag}
</if>
<if test="param.replaceRemark != null and param.replaceRemark.trim() != ''">
and a.REPLACE_REMARK like concat('%',replace(replace(#{param.replaceRemark},'_','\\_'),'%','\\%'),'%')
</if>
<if test="param.authSql != null and param.authSql.trim() != ''"> <if test="param.authSql != null and param.authSql.trim() != ''">
${param.authSql} ${param.authSql}
</if> </if>
...@@ -2236,7 +2257,9 @@ ...@@ -2236,7 +2257,9 @@
a.INSURANCE_PROVINCE as insuranceProvince, a.INSURANCE_PROVINCE as insuranceProvince,
a.INSURANCE_PROVINCE_NAME as insuranceProvinceName, a.INSURANCE_PROVINCE_NAME as insuranceProvinceName,
a.INSURANCE_CITY as insuranceCity, a.INSURANCE_CITY as insuranceCity,
a.INSURANCE_CITY_NAME as insuranceCityName a.INSURANCE_CITY_NAME as insuranceCityName,
a.REPLACE_TAG as replaceTag,
a.REPLACE_REMARK as replaceRemark
from t_insurance_detail a from t_insurance_detail a
where a.DELETE_FLAG = 0 and a.BUY_HANDLE_STATUS = 3 and IS_USE = 0 and IS_EFFECT = 0 and IS_OVERDUE = 0 where a.DELETE_FLAG = 0 and a.BUY_HANDLE_STATUS = 3 and IS_USE = 0 and IS_EFFECT = 0 and IS_OVERDUE = 0
<if test="param.empNameOrCard != null and param.empNameOrCard.trim() != ''"> <if test="param.empNameOrCard != null and param.empNameOrCard.trim() != ''">
...@@ -2263,6 +2286,12 @@ ...@@ -2263,6 +2286,12 @@
<if test="param.buyStandardMax != null and param.buyStandardMax.trim() != ''"> <if test="param.buyStandardMax != null and param.buyStandardMax.trim() != ''">
AND a.BUY_STANDARD+0 <![CDATA[ <= ]]> #{param.buyStandardMax}+0 AND a.BUY_STANDARD+0 <![CDATA[ <= ]]> #{param.buyStandardMax}+0
</if> </if>
<if test="param.replaceTag != null and param.replaceTag.trim() != ''">
and a.REPLACE_TAG = #{param.replaceTag}
</if>
<if test="param.replaceRemark != null and param.replaceRemark.trim() != ''">
and a.REPLACE_REMARK like concat('%',replace(replace(#{param.replaceRemark},'_','\\_'),'%','\\%'),'%')
</if>
<if test="param.authSql != null and param.authSql.trim() != ''"> <if test="param.authSql != null and param.authSql.trim() != ''">
${param.authSql} ${param.authSql}
</if> </if>
......
...@@ -572,6 +572,7 @@ ...@@ -572,6 +572,7 @@
where a.DELETE_FLAG = '0' where a.DELETE_FLAG = '0'
AND a.EXPIRE_IGNORE_FLAG = '1' AND a.EXPIRE_IGNORE_FLAG = '1'
AND a.IS_EFFECT = 0 AND a.IS_EFFECT = 0
AND (a.REPLACE_TAG IS NULL OR a.REPLACE_TAG != '可替换')
</select> </select>
<resultMap id="PushWxResultMap" type="com.yifu.cloud.plus.v1.yifu.insurances.vo.InsuranceAlertWx"> <resultMap id="PushWxResultMap" type="com.yifu.cloud.plus.v1.yifu.insurances.vo.InsuranceAlertWx">
<result property="projectName" column="DEPT_NAME" jdbcType="VARCHAR"/> <result property="projectName" column="DEPT_NAME" jdbcType="VARCHAR"/>
......
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