From db47370fb865794e55f05a3bfac0f4d6a8939dff Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Wed, 6 Apr 2022 16:38:54 +0800
Subject: [PATCH] emm

---
 .../com/epmet/dao/IcVaccineRelationDao.java   |  3 +-
 .../service/impl/IcVaccineServiceImpl.java    | 28 +++++++++----------
 .../resources/mapper/IcVaccineRelationDao.xml | 10 +++++++
 3 files changed, 26 insertions(+), 15 deletions(-)

diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcVaccineRelationDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcVaccineRelationDao.java
index 6e1d2a8c9f..5bbd7a7ff3 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcVaccineRelationDao.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcVaccineRelationDao.java
@@ -3,6 +3,7 @@ package com.epmet.dao;
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.entity.IcVaccineRelationEntity;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 疫苗接种记录关系表
@@ -12,5 +13,5 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface IcVaccineRelationDao extends BaseDao<IcVaccineRelationEntity> {
-	
+    int delRelation(@Param("icNatId") String icNatId, @Param("agencyId") String agencyId);
 }
\ No newline at end of file
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccineServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccineServiceImpl.java
index d4c4676bb8..49ac2e56fc 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccineServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccineServiceImpl.java
@@ -15,15 +15,13 @@ import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.redis.common.CustomerStaffRedis;
 import com.epmet.commons.tools.utils.*;
 import com.epmet.constants.ImportTaskConstants;
-import com.epmet.dao.IcNatRelationDao;
-import com.epmet.dao.IcResiUserDao;
-import com.epmet.dao.IcVaccineDao;
-import com.epmet.dao.UserBaseInfoDao;
+import com.epmet.dao.*;
 import com.epmet.dto.form.*;
 import com.epmet.dto.result.*;
 import com.epmet.entity.IcNatRelationEntity;
 import com.epmet.entity.IcResiUserEntity;
 import com.epmet.entity.IcVaccineEntity;
+import com.epmet.entity.IcVaccineRelationEntity;
 import com.epmet.excel.data.IcNatImportExcelData;
 import com.epmet.excel.handler.IcNatExcelImportListener;
 import com.epmet.excel.handler.IcVaccineExcelImportListener;
@@ -73,6 +71,8 @@ public class IcVaccineServiceImpl extends BaseServiceImpl<IcVaccineDao, IcVaccin
     @Autowired
     private IcNatRelationDao icNatRelationDao;
     @Autowired
+    private IcVaccineRelationDao icVaccineRelationDao;
+    @Autowired
     private IcResiUserDao icResiUserDao;
     @Autowired
     private UserService userService;
@@ -143,15 +143,15 @@ public class IcVaccineServiceImpl extends BaseServiceImpl<IcVaccineDao, IcVaccin
             throw new EpmetException(String.format("查询工作人员%s缓存信息失败...", formDTO.getUserId()));
         }
         //2.不管是否已存在关系数据都是先删后增
-        icNatRelationDao.delRelation(formDTO.getIcVaccineId(), staffInfo.getAgencyId());
+        icVaccineRelationDao.delRelation(formDTO.getIcVaccineId(), staffInfo.getAgencyId());
         //3.新增关系数据
-        IcNatRelationEntity relationEntity = new IcNatRelationEntity();
-        relationEntity.setCustomerId(formDTO.getCustomerId());
-        relationEntity.setIcNatId(formDTO.getIcNatId());
-        relationEntity.setAgencyId(staffInfo.getAgencyId());
-        relationEntity.setPids(com.baomidou.mybatisplus.core.toolkit.StringUtils.isNotBlank(staffInfo.getAgencyPIds())?staffInfo.getAgencyPIds()+":"+staffInfo.getAgencyId():staffInfo.getAgencyId());
-        relationEntity.setUserType("synchro");
-        icNatRelationDao.insert(relationEntity);
+        IcVaccineRelationEntity icVaccineRelationEntity = new IcVaccineRelationEntity();
+        icVaccineRelationEntity.setCustomerId(formDTO.getCustomerId());
+        icVaccineRelationEntity.setIcVaccineId(formDTO.getIcVaccineId());
+        icVaccineRelationEntity.setAgencyId(staffInfo.getAgencyId());
+        icVaccineRelationEntity.setPids(com.baomidou.mybatisplus.core.toolkit.StringUtils.isNotBlank(staffInfo.getAgencyPIds())?staffInfo.getAgencyPIds()+":"+staffInfo.getAgencyId():staffInfo.getAgencyId());
+        icVaccineRelationEntity.setUserType("synchro");
+        icVaccineRelationDao.insert(icVaccineRelationEntity);
     }
 
     /**
@@ -168,8 +168,8 @@ public class IcVaccineServiceImpl extends BaseServiceImpl<IcVaccineDao, IcVaccin
             throw new EpmetException(String.format("查询工作人员%s缓存信息失败...", formDTO.getUserId()));
         }
         //1.物理删除关系数据
-        if (icNatRelationDao.delRelation(formDTO.getIcNatId(), staffInfo.getAgencyId()) < NumConstant.ONE) {
-            log.error(String.format("数据取消同步失败,疫苗记录Id->%s", formDTO.getIcNatId()));
+        if (icVaccineRelationDao.delRelation(formDTO.getIcVaccineId(), staffInfo.getAgencyId()) < NumConstant.ONE) {
+            log.error(String.format("数据取消同步失败,疫苗记录Id->%s", formDTO.getAgencyId()));
             throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "取消同步操作失败");
         }
     }
diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcVaccineRelationDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcVaccineRelationDao.xml
index 4c356c5e10..3ba4733fe3 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcVaccineRelationDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcVaccineRelationDao.xml
@@ -3,4 +3,14 @@
 
 <mapper namespace="com.epmet.dao.IcVaccineRelationDao">
 
+    <delete id="delRelation">
+        DELETE
+        FROM ic_nat_relation
+        WHERE
+        ic_nat_id = #{icNatId}
+        <if test='null != agencyId and "" != agencyId'>
+            AND AGENCY_ID = #{agencyId}
+        </if>
+    </delete>
+
 </mapper>
\ No newline at end of file