diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcVaccinePrarmeterDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcVaccinePrarmeterDao.java index c5bdfcdbf7..a0a579e1cb 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcVaccinePrarmeterDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcVaccinePrarmeterDao.java @@ -6,6 +6,7 @@ import com.epmet.dto.IcVaccinePrarmeterDTO; import com.epmet.dto.form.VaccinePrarmeterListFormDTO; import com.epmet.entity.IcVaccinePrarmeterEntity; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import java.util.List; import java.util.Map; @@ -28,4 +29,6 @@ public interface IcVaccinePrarmeterDao extends BaseDao */ List getPhrasePage(Map params); + void deleteByIdCard(@Param("isCardList") List isCardList); + } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java index 5f2590c1eb..4c4da7574b 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccinePrarmeterServiceImpl.java @@ -241,12 +241,21 @@ public class IcVaccinePrarmeterServiceImpl extends BaseServiceImpl needInsert = groupByStatus.get(false); if (CollectionUtils.isNotEmpty(needInsert)){ List entities = ConvertUtils.sourceToTarget(needInsert, IcVaccinePrarmeterEntity.class); + // 要删除的身份证号 + List isCardList = new ArrayList(); entities.forEach(e -> { // 设置客户ID e.setCustomerId(tokenDto.getCustomerId()); // 设置审核状态为待审核 e.setCheckState("0"); + // 存储删除身份证号 + isCardList.add(e.getIdCard()); }); + + // 先根据身份证号删除 + baseDao.deleteByIdCard(isCardList); + + // 再新增 insertBatch(entities); } if (CollectionUtils.isNotEmpty(errorInfo)){ diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcVaccinePrarmeterDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcVaccinePrarmeterDao.xml index ebbebfe289..0a82a1f665 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcVaccinePrarmeterDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcVaccinePrarmeterDao.xml @@ -185,5 +185,13 @@ order by CREATED_TIME desc + + update ic_vaccine_prarmeter set DEL_FLAG = '1' , UPDATED_TIME = now() + where ID_CARD IN + + #{idCard} + + +