|
|
@ -299,7 +299,7 @@ public class IcEpidemicSpecialAttentionServiceImpl extends BaseServiceImpl<IcEpi |
|
|
|
for (int i = 0; i < list.size(); i++) { |
|
|
|
list.get(i).setNum(i+1); |
|
|
|
list.get(i).setAttentionType(attentionType); |
|
|
|
list.get(i).setChannel(getChannel(list.get(i).getChannelString())); |
|
|
|
// list.get(i).setChannel(getChannel(list.get(i).getChannelString()));
|
|
|
|
if (StringUtils.isBlank(list.get(i).getName()) && !list.get(i).getAddStatus()){ |
|
|
|
errorInfo.add(getErrorInfo(list.get(i), "姓名不能为空",i+1)); |
|
|
|
list.get(i).setAddStatus(true); |
|
|
@ -352,8 +352,8 @@ public class IcEpidemicSpecialAttentionServiceImpl extends BaseServiceImpl<IcEpi |
|
|
|
e.setCustomerId(tokenDto.getCustomerId()); |
|
|
|
}); |
|
|
|
insertBatch(entities); |
|
|
|
// send msg
|
|
|
|
List<ImportEpidemicSpecialAttention> needSendList = needInsert.stream().filter(l -> CollectionUtils.isNotEmpty(l.getChannel())).collect(Collectors.toList()); |
|
|
|
// send msg 产品说导入不用发通知
|
|
|
|
/*List<ImportEpidemicSpecialAttention> needSendList = needInsert.stream().filter(l -> CollectionUtils.isNotEmpty(l.getChannel())).collect(Collectors.toList()); |
|
|
|
if (CollectionUtils.isNotEmpty(needSendList)) { |
|
|
|
SendNoticeFormDTO dto = new SendNoticeFormDTO(); |
|
|
|
List<SendNoticeFormDTO.UserListBean> userListBeans = ConvertUtils.sourceToTarget(needSendList, SendNoticeFormDTO.UserListBean.class); |
|
|
@ -364,7 +364,7 @@ public class IcEpidemicSpecialAttentionServiceImpl extends BaseServiceImpl<IcEpi |
|
|
|
dto.setContent(needSendList.get(NumConstant.ZERO).getContent()); |
|
|
|
dto.setStaffId(tokenDto.getUserId()); |
|
|
|
noticeService.sendNotice(dto); |
|
|
|
} |
|
|
|
}*/ |
|
|
|
} |
|
|
|
if (CollectionUtils.isNotEmpty(errorInfo)){ |
|
|
|
String url = importOssUpload(errorInfo, EpidemicSpecialAttentionErrorModel.class); |
|
|
|