Commit 28ff1c3a authored by fangxinjiang's avatar fangxinjiang

商险消息提醒忽略增加备注且必填-fxj

parent fa54392c
...@@ -112,8 +112,8 @@ public class TInsurancesWarnController { ...@@ -112,8 +112,8 @@ public class TInsurancesWarnController {
@SysLog("到期提醒批量忽略") @SysLog("到期提醒批量忽略")
@PutMapping("/batchexpireIgnore") @PutMapping("/batchexpireIgnore")
@PreAuthorize("@pms.hasPermission('wxhr:insurance_expireignore')") @PreAuthorize("@pms.hasPermission('wxhr:insurance_expireignore')")
public R<Object> batchexpireIgnore(@RequestBody List<String> ids) { public R<Object> batchexpireIgnore(@RequestBody List<String> ids,String remark) {
return insuranceDetailService.batchexpireIgnore(ids); return insuranceDetailService.batchexpireIgnore(ids,remark);
} }
/** /**
......
...@@ -320,7 +320,7 @@ public interface TInsuranceDetailMapper extends BaseMapper<TInsuranceDetail> { ...@@ -320,7 +320,7 @@ public interface TInsuranceDetailMapper extends BaseMapper<TInsuranceDetail> {
void batchexpireIgnore(@Param("idList")List<String> idList); void batchexpireIgnore(@Param("idList")List<String> idList);
void batchexpireAlertIgnore(@Param("idList")List<String> idList); void batchexpireAlertIgnore(@Param("idList")List<String> idList,@Param("remark")String remark);
void updateExpireAlert(@Param("id") String id,@Param("expireFlag") String expireFlag,@Param("remark") String remark); void updateExpireAlert(@Param("id") String id,@Param("expireFlag") String expireFlag,@Param("remark") String remark);
......
...@@ -533,7 +533,7 @@ public interface TInsuranceDetailService extends IService<TInsuranceDetail> { ...@@ -533,7 +533,7 @@ public interface TInsuranceDetailService extends IService<TInsuranceDetail> {
R<Integer> getUserInsuranceMessageWarnCount(String userName); R<Integer> getUserInsuranceMessageWarnCount(String userName);
R<Object> batchexpireIgnore(List<String> ids); R<Object> batchexpireIgnore(List<String> ids,String remark);
R<Object> expireIgnore(TBusinessInsuranceVo vo); R<Object> expireIgnore(TBusinessInsuranceVo vo);
......
...@@ -7911,13 +7911,13 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap ...@@ -7911,13 +7911,13 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
} }
@Override @Override
public R<Object> batchexpireIgnore(List<String> ids) { public R<Object> batchexpireIgnore(List<String> ids,String remark) {
if (Common.isEmpty(ids)){ if (Common.isEmpty(ids) || Common.isEmpty(remark)){
return R.failed(CommonConstants.PARAM_IS_NOT_ERROR); return R.failed(CommonConstants.PARAM_IS_NOT_ERROR);
} }
baseMapper.batchexpireIgnore(ids); baseMapper.batchexpireIgnore(ids);
//更新商险到期提醒表 //更新商险到期提醒表
baseMapper.batchexpireAlertIgnore(ids); baseMapper.batchexpireAlertIgnore(ids,remark);
return R.ok(); return R.ok();
} }
...@@ -7997,7 +7997,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap ...@@ -7997,7 +7997,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
} }
@Override @Override
public R<Object> expireIgnore(TBusinessInsuranceVo vo) { public R<Object> expireIgnore(TBusinessInsuranceVo vo) {
if (Common.isEmpty(vo.getId())) { if (Common.isEmpty(vo.getId()) || Common.isEmpty(vo.getExpireRemark())) {
return R.failed(InsurancesConstants.UPLOAD_PARAM_CHECK_FAIL); return R.failed(InsurancesConstants.UPLOAD_PARAM_CHECK_FAIL);
} }
TInsuranceDetail entity = baseMapper.selectById(vo.getId()); TInsuranceDetail entity = baseMapper.selectById(vo.getId());
...@@ -8005,6 +8005,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap ...@@ -8005,6 +8005,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
return R.failed("未查询到相关商险订单"); return R.failed("未查询到相关商险订单");
} }
entity.setExpireIgnoreFlag(CommonConstants.ZERO_STRING); entity.setExpireIgnoreFlag(CommonConstants.ZERO_STRING);
entity.setExpireRemark(vo.getExpireRemark());
baseMapper.updateById(entity); baseMapper.updateById(entity);
baseMapper.updateExpireAlert(entity.getId(),CommonConstants.ZERO_STRING,null); baseMapper.updateExpireAlert(entity.getId(),CommonConstants.ZERO_STRING,null);
return R.ok(); return R.ok();
......
...@@ -2046,7 +2046,7 @@ ...@@ -2046,7 +2046,7 @@
<update id="batchexpireIgnore"> <update id="batchexpireIgnore">
<if test="idList != null and idList.size() > 0"> <if test="idList != null and idList.size() > 0">
update t_insurance_detail a update t_insurance_detail a
set a.EXPIRE_IGNORE_FLAG = '0' set a.EXPIRE_IGNORE_FLAG = '0',a.EXPIRE_REMARK=#{remark}
where where
a.id in a.id in
<foreach collection="idList" item="param" index="index" open="(" close=")" separator=","> <foreach collection="idList" item="param" index="index" open="(" close=")" separator=",">
...@@ -2058,7 +2058,7 @@ ...@@ -2058,7 +2058,7 @@
<update id="batchexpireAlertIgnore"> <update id="batchexpireAlertIgnore">
<if test="idList != null and idList.size() > 0"> <if test="idList != null and idList.size() > 0">
update t_insurance_alert a update t_insurance_alert a
set a.EXPIRE_IGNORE_FLAG = '0' set a.EXPIRE_IGNORE_FLAG = '0',a.EXPIRE_REMARK=#{remark}
where where
a.id in a.id in
<foreach collection="idList" item="param" index="index" open="(" close=")" separator=","> <foreach collection="idList" item="param" index="index" open="(" close=")" separator=",">
......
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