From f57a120d0f2e877bd40e2e20e8bf4f971506db0f Mon Sep 17 00:00:00 2001
From: sunyuchao <SunYuChao123>
Date: Fri, 11 Nov 2022 15:17:22 +0800
Subject: [PATCH] =?UTF-8?q?=E7=96=AB=E8=8B=97=E6=8E=A5=E7=A7=8D=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=E5=A2=9E=E5=8A=A0=E6=98=AF=E5=90=A6=E6=9C=AC=E8=BE=96?=
 =?UTF-8?q?=E5=8C=BA=E5=B1=85=E6=B0=91=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/dto/IcVaccineRelationDTO.java  |  5 +++++
 .../epmet/dto/result/IcVaccineListResultDTO.java  |  7 +++++++
 .../com/epmet/entity/IcVaccineRelationEntity.java |  5 +++++
 .../epmet/service/impl/IcVaccineServiceImpl.java  | 15 ++++++++-------
 .../V0.0.87__alter_ic_vaccine_relation.sql        |  5 +++++
 .../src/main/resources/mapper/IcVaccineDao.xml    |  3 ++-
 6 files changed, 32 insertions(+), 8 deletions(-)
 create mode 100644 epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.87__alter_ic_vaccine_relation.sql

diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcVaccineRelationDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcVaccineRelationDTO.java
index 7939293b5b..5fcb403a1e 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcVaccineRelationDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcVaccineRelationDTO.java
@@ -50,6 +50,11 @@ public class IcVaccineRelationDTO implements Serializable {
      */
 	private String userType;
 
+    /**
+     * 是否本辖区居民，1：是；0：否
+     */
+    private String isLocalResiUser;
+
     /**
      * 删除标识
      */
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcVaccineListResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcVaccineListResultDTO.java
index 87480268cf..1764d1c61c 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcVaccineListResultDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcVaccineListResultDTO.java
@@ -85,5 +85,12 @@ public class IcVaccineListResultDTO implements Serializable {
     @ExcelProperty(value = "疫苗厂家",order = 7)
     private String manufacturer;
 
+    /**
+     * 是否本辖区居民，1：是；0：否
+     */
+    @ExcelIgnore
+    private String isLocalResiUser;
+
+
 
 }
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcVaccineRelationEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcVaccineRelationEntity.java
index d4cfb6ad48..cbacf0b140 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcVaccineRelationEntity.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcVaccineRelationEntity.java
@@ -49,4 +49,9 @@ public class IcVaccineRelationEntity extends BaseEpmetEntity {
      */
 	private String userType;
 
+    /**
+     * 是否本辖区居民，1：是；0：否
+     */
+    private String isLocalResiUser;
+
 }
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 6d183807ab..cdb0e2348b 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
@@ -23,10 +23,7 @@ import com.epmet.dao.IcVaccineDao;
 import com.epmet.dao.IcVaccineRelationDao;
 import com.epmet.dto.IcVaccineDTO;
 import com.epmet.dto.form.*;
-import com.epmet.dto.result.IcVaccineListResultDTO;
-import com.epmet.dto.result.LoginUserDetailsResultDTO;
-import com.epmet.dto.result.UploadImgResultDTO;
-import com.epmet.dto.result.VaccineListDTO;
+import com.epmet.dto.result.*;
 import com.epmet.entity.IcResiUserEntity;
 import com.epmet.entity.IcVaccineEntity;
 import com.epmet.entity.IcVaccineRelationEntity;
@@ -369,7 +366,7 @@ public class IcVaccineServiceImpl extends BaseServiceImpl<IcVaccineDao, IcVaccin
 
             // 建立关系
             if (resi != null) {
-                createVaccineRelation(resiVaccine.getId(), resi.getAgencyId(), resi.getPids());
+                createVaccineRelation(resiVaccine.getId(), resi.getAgencyId(), resi.getPids(), agencyPids);
             }
 
             return;
@@ -383,7 +380,7 @@ public class IcVaccineServiceImpl extends BaseServiceImpl<IcVaccineDao, IcVaccin
 
         // 只要是居民，就创建上关系
         if (resi != null) {
-            createVaccineRelation(e.getId(), resi.getAgencyId(), resi.getPids());
+            createVaccineRelation(e.getId(), resi.getAgencyId(), resi.getPids(), agencyPids);
         }
     }
 
@@ -425,7 +422,7 @@ public class IcVaccineServiceImpl extends BaseServiceImpl<IcVaccineDao, IcVaccin
      * @param vaccineId
      * @param currentUserAgencyId
      */
-    private void createVaccineRelation(String vaccineId, String currentUserAgencyId, String agencyPids) {
+    private void createVaccineRelation(String vaccineId, String currentUserAgencyId, String agencyPids, String tokenAgencyPids) {
 
         // 没有关系创建关系，有关系就跳过
         LambdaQueryWrapper<IcVaccineRelationEntity> query = new LambdaQueryWrapper<>();
@@ -440,6 +437,7 @@ public class IcVaccineServiceImpl extends BaseServiceImpl<IcVaccineDao, IcVaccin
         relation.setPids(String.join(":", Arrays.asList(agencyPids, currentUserAgencyId)));
         relation.setIcVaccineId(vaccineId);
         relation.setUserType("import");
+        relation.setIsLocalResiUser(tokenAgencyPids.contains(currentUserAgencyId) ? NumConstant.ONE_STR : NumConstant.ZERO_STR);
         icVaccineRelationDao.insert(relation);
     }
 
@@ -508,6 +506,9 @@ public class IcVaccineServiceImpl extends BaseServiceImpl<IcVaccineDao, IcVaccin
         IcVaccineRelationEntity relationEntity = ConvertUtils.sourceToTarget(formDTO, IcVaccineRelationEntity.class);
         relationEntity.setIcVaccineId(entity.getId());
         relationEntity.setPids(StringUtils.isNotBlank(agencyInfo.getPids()) ? agencyInfo.getPids() + ":" + formDTO.getAgencyId() : formDTO.getAgencyId());
+        //判断当前身份证号是否本辖区下居民
+        ResiAndLocalResiResultDTO resiCount = icResiUserDao.getResiCount(formDTO.getAgencyId(), formDTO.getIdCard(), formDTO.getCustomerId());
+        relationEntity.setIsLocalResiUser(resiCount.getIsLocal() == NumConstant.ZERO ? NumConstant.ZERO_STR : NumConstant.ONE_STR);
         icVaccineRelationDao.insert(relationEntity);
 
         //3.新增通知表信息
diff --git a/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.87__alter_ic_vaccine_relation.sql b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.87__alter_ic_vaccine_relation.sql
new file mode 100644
index 0000000000..68b0546001
--- /dev/null
+++ b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.87__alter_ic_vaccine_relation.sql
@@ -0,0 +1,5 @@
+
+ALTER TABLE `ic_vaccine_relation`
+ADD COLUMN `IS_LOCAL_RESI_USER`  varchar(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '是否本辖区居民，1：是；0：否' AFTER `USER_TYPE`;
+
+
diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcVaccineDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcVaccineDao.xml
index b8113074cf..d4a58ec8a9 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcVaccineDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcVaccineDao.xml
@@ -35,6 +35,7 @@
             a.IC_VACCINE_ID AS vaccineId,
             a.agency_id,
             a.user_type,
+            a.is_local_resi_user isLocalResiUser,
             b.`name`,
             b.mobile,
             b.id_card,
@@ -63,7 +64,7 @@
                 AND b.INOCULATE_TIME <![CDATA[ <= ]]> #{endTime}
             </if>
             <if test='isResiUser != null and isResiUser != ""'>
-                AND b.IS_RESI_USER  = #{isResiUser}
+                AND a.is_local_resi_user = #{isResiUser}
             </if>
         ORDER BY b.INOCULATE_TIME DESC, b.id ASC
     </select>