Commit 42b7a1a7 authored by fangxinjiang's avatar fangxinjiang

商险提醒优化-fxj

parent d5e0d633
...@@ -207,5 +207,17 @@ public class TInsuranceAlert extends BaseEntity { ...@@ -207,5 +207,17 @@ public class TInsuranceAlert extends BaseEntity {
@Schema(description = "消息提醒备注") @Schema(description = "消息提醒备注")
private String expireRemark; private String expireRemark;
/**
* 消息提醒人
*/
@Schema(description = "消息提醒人")
private String alerter;
/**
* 消息提醒人ID
*/
@Schema(description = "消息提醒人ID")
private String alertId;
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
} }
\ No newline at end of file
...@@ -42,4 +42,16 @@ public class InsuranceSearchVo extends TBusinessInsuranceVo{ ...@@ -42,4 +42,16 @@ public class InsuranceSearchVo extends TBusinessInsuranceVo{
* 导出选择的ID * 导出选择的ID
**/ **/
private String idStr; private String idStr;
/**
* @Author fxj
* 新增到期提醒人
**/
private String alerter;
/**
* 消息提醒人ID
*/
@Schema(description = "消息提醒人ID")
private String alertId;
} }
...@@ -7818,9 +7818,9 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap ...@@ -7818,9 +7818,9 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
long roleId = 1851541100126863362L; long roleId = 1851541100126863362L;
boolean isSsc = this.haveRole(user, roleId); boolean isSsc = this.haveRole(user, roleId);
if (isSsc) { if (isSsc) {
condition.setCreateBy(null); condition.setAlertId(null);
} else { } else {
condition.setCreateBy(user.getId()); condition.setAlertId(user.getId());
} }
// R<TSettleDomainListVo> sdRes = archivesDaprUtil.getPermissionByUserId(user.getId()); // R<TSettleDomainListVo> sdRes = archivesDaprUtil.getPermissionByUserId(user.getId());
// List<TInsuranceAreaRes> areaRes = insuranceAreaResMapper.selectList(Wrappers.<TInsuranceAreaRes>query().lambda() // List<TInsuranceAreaRes> areaRes = insuranceAreaResMapper.selectList(Wrappers.<TInsuranceAreaRes>query().lambda()
......
...@@ -155,6 +155,8 @@ public class TInsuranceWarnServiceImpl extends ServiceImpl<TInsuranceWarnMapper, ...@@ -155,6 +155,8 @@ public class TInsuranceWarnServiceImpl extends ServiceImpl<TInsuranceWarnMapper,
for (TInsuranceAlert alert: list){ for (TInsuranceAlert alert: list){
userId = null; userId = null;
nickName = null; nickName = null;
alert.setAlertId(alert.getCreateBy());
alert.setAlerter(alert.getCreateName());
if (Common.isNotNull(userMap.get(alert.getCreateBy()))){ if (Common.isNotNull(userMap.get(alert.getCreateBy()))){
domain = domainHashMap.get(alert.getDeptNo()); domain = domainHashMap.get(alert.getDeptNo());
if (Common.isNotNull(domain)){ if (Common.isNotNull(domain)){
...@@ -173,8 +175,8 @@ public class TInsuranceWarnServiceImpl extends ServiceImpl<TInsuranceWarnMapper, ...@@ -173,8 +175,8 @@ public class TInsuranceWarnServiceImpl extends ServiceImpl<TInsuranceWarnMapper,
nickName= sysConfig.getConfigValue1(); nickName= sysConfig.getConfigValue1();
} }
if (Common.isNotNull(nickName) && Common.isNotNull(userId)){ if (Common.isNotNull(nickName) && Common.isNotNull(userId)){
alert.setCreateBy(userId); alert.setAlerter(nickName);
alert.setCreateName(nickName); alert.setAlertId(userId);
} }
} }
} }
......
...@@ -1854,8 +1854,11 @@ ...@@ -1854,8 +1854,11 @@
<if test="param.isOverdue != null and param.isOverdue.trim() != ''"> <if test="param.isOverdue != null and param.isOverdue.trim() != ''">
AND a.IS_OVERDUE = #{param.isOverdue} AND a.IS_OVERDUE = #{param.isOverdue}
</if> </if>
<if test="param.createBy != null and param.createBy.trim() != ''"> <if test="param.alerter != null and param.alerter.trim() != ''">
and a.CREATE_BY = #{param.createBy} and a.ALERTER = #{param.alerter}
</if>
<if test="param.alertId != null and param.alertId.trim() != ''">
and a.ALERT_ID = #{param.alertId}
</if> </if>
<if test="param.idList != null and param.idList.size() > 0"> <if test="param.idList != null and param.idList.size() > 0">
and a.id in and a.id in
...@@ -2010,6 +2013,7 @@ ...@@ -2010,6 +2013,7 @@
LEFT JOIN view_insurance_replace r2 on a.id=r2.FROM_INSURANCE_DETAIL_ID LEFT JOIN view_insurance_replace r2 on a.id=r2.FROM_INSURANCE_DETAIL_ID
LEFT JOIN t_insurance_refund rf on rf.INS_DETAIL_ID=a.id LEFT JOIN t_insurance_refund rf on rf.INS_DETAIL_ID=a.id
<include refid="expire_sql_where"/> <include refid="expire_sql_where"/>
group by a.id
order by a.POLICY_END asc order by a.POLICY_END asc
<if test="param != null and param.limitStart != null"> <if test="param != null and param.limitStart != null">
limit #{param.limitStart},#{param.limitEnd} limit #{param.limitStart},#{param.limitEnd}
......
...@@ -43,6 +43,8 @@ ...@@ -43,6 +43,8 @@
<result property="unitNo" column="UNIT_NO" jdbcType="VARCHAR"/> <result property="unitNo" column="UNIT_NO" jdbcType="VARCHAR"/>
<result property="expireIgnoreFlag" column="EXPIRE_IGNORE_FLAG" jdbcType="VARCHAR"/> <result property="expireIgnoreFlag" column="EXPIRE_IGNORE_FLAG" jdbcType="VARCHAR"/>
<result property="expireRemark" column="EXPIRE_REMARK" jdbcType="VARCHAR"/> <result property="expireRemark" column="EXPIRE_REMARK" jdbcType="VARCHAR"/>
<result property="alerter" column="ALERTER" jdbcType="VARCHAR"/>
<result property="alertId" column="ALERT_ID" jdbcType="VARCHAR"/>
</resultMap> </resultMap>
......
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