list.add(dto);

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcEpidemicSpecialAttentionServiceImpl.java

@@ -2,6 +2,7 @@ package com.epmet.service.impl;
 
 import cn.afterturn.easypoi.excel.ExcelExportUtil;
 import cn.afterturn.easypoi.excel.entity.ExportParams;
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -290,6 +291,7 @@ public class IcEpidemicSpecialAttentionServiceImpl extends BaseServiceImpl<IcEpi
         List<String> idCards = entities.stream().map(m -> m.getIdCard()).collect(Collectors.toList());
         Integer attentionType = entities.get(NumConstant.ZERO).getAttentionType();
         List<String> existList = baseDao.getExistList(attentionType, idCards);
+        log.info("ic_epidemic_special_attention是否存在记录？attentionType="+attentionType+";idCards="+JSON.toJSONString(idCards)+";existList="+ JSON.toJSONString(existList));
         List<IcEpidemicSpecialAttentionEntity> existsEntities = new ArrayList<>();
         if (CollectionUtils.isNotEmpty(existList)){
             for (String s : existList) {
@@ -303,19 +305,21 @@ public class IcEpidemicSpecialAttentionServiceImpl extends BaseServiceImpl<IcEpi
             }
             baseDao.addExistAttention(existsEntities,attentionType);
         }
-        entities.forEach(e -> {
+        if(CollectionUtils.isNotEmpty(entities)){
-            e.setIsAttention(NumConstant.ONE);
+            entities.forEach(e -> {
-            e.setOrgId(agencyInfo.getId());
+                e.setIsAttention(NumConstant.ONE);
-            e.setPid(agencyInfo.getPid());
+                e.setOrgId(agencyInfo.getId());
-            e.setPids(agencyInfo.getPids());
+                e.setPid(agencyInfo.getPid());
-            e.setCustomerId(formDTO.getCustomerId());
+                e.setPids(agencyInfo.getPids());
-            e.setIsHistory(NumConstant.ZERO_STR);
+                e.setCustomerId(formDTO.getCustomerId());
-            if(StringUtils.isBlank(e.getIsolatedState())){
+                e.setIsHistory(NumConstant.ZERO_STR);
-                //从行程上报界面，点击加入重点人群关注，默认隔离状态是居家隔离
+                if(StringUtils.isBlank(e.getIsolatedState())){
-                e.setIsolatedState(NumConstant.ONE_STR);
+                    //从行程上报界面，点击加入重点人群关注，默认隔离状态是居家隔离
-            }
+                    e.setIsolatedState(NumConstant.ONE_STR);
-        });
+                }
-        insertBatch(entities);
+            });
+            insertBatch(entities);
+        }
         //新增通知表信息
         List<IcEpidemicSpecialAttentionDTO> needSedNotice = formDTO.getList().stream().filter(l -> CollectionUtils.isNotEmpty(l.getChannel())).collect(Collectors.toList());
         if (CollectionUtils.isNotEmpty(needSedNotice)) {

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java

@@ -1,8 +1,5 @@
 package com.epmet.service.impl;
 
-import cn.afterturn.easypoi.excel.ExcelExportUtil;
-import cn.afterturn.easypoi.excel.entity.ExportParams;
-import cn.afterturn.easypoi.excel.entity.result.ExcelImportResult;
 import com.alibaba.excel.EasyExcel;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -17,7 +14,6 @@ import com.epmet.commons.tools.enums.DictTypeEnum;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.EpmetException;
 import com.epmet.commons.tools.exception.ExceptionUtils;
-import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.feign.ResultDataResolver;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.redis.common.CustomerOrgRedis;
@@ -25,7 +21,10 @@ import com.epmet.commons.tools.redis.common.CustomerStaffRedis;
 import com.epmet.commons.tools.redis.common.bean.AgencyInfoCache;
 import com.epmet.commons.tools.redis.common.bean.GridInfoCache;
 import com.epmet.commons.tools.security.dto.TokenDto;
-import com.epmet.commons.tools.utils.*;
+import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.commons.tools.utils.DateUtils;
+import com.epmet.commons.tools.utils.FileUtils;
+import com.epmet.commons.tools.utils.Result;
 import com.epmet.constant.IcResiUserConstant;
 import com.epmet.constants.ImportTaskConstants;
 import com.epmet.dao.IcDangerAreaDao;
@@ -63,21 +62,17 @@ import org.apache.commons.fileupload.FileItemFactory;
 import org.apache.commons.fileupload.disk.DiskFileItemFactory;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.http.entity.ContentType;
-import org.apache.poi.ss.usermodel.Workbook;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.commons.CommonsMultipartFile;
 
-import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
-import java.io.InputStream;
 import java.io.OutputStream;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.*;
-import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.stream.Collectors;
 
 /**
@@ -292,12 +287,13 @@ public class IcTripReportRecordServiceImpl extends BaseServiceImpl<IcTripReportR
         dto.setMobile(formDTO.getMobile());
         //避免再发通知，赋值个空集合吧
         dto.setChannel(Collections.emptyList());
-        //关注类型，核酸检测：2，疫苗接种：1;行程上报：0
+        //关注类型，核酸检测：2，
+        // 疫苗接种：1;
+        // 行程上报：0
         dto.setAttentionType(NumConstant.TWO);
         dto.setReason("有重点区域行程");
         dto.setIsolatedState(StringUtils.isEmpty(formDTO.getIsolateType()) ? NumConstant.ONE_STR : formDTO.getIsolateType());
         list.add(dto);
-        list.add(dto);
         vaccinationAddFormDTO.setList(list);
         epidemicSpecialAttentionService.vaccinationAdd( vaccinationAddFormDTO);
     }