From 3728139e730e08dc82821cd631348866f9620f48 Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Thu, 7 Jul 2022 15:02:04 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A8=8B=E5=BA=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/epmet/dto/IcVaccineDTO.java           | 5 +++++
 .../main/java/com/epmet/dto/form/AddIcVaccineFormDTO.java   | 4 ++--
 .../src/main/java/com/epmet/entity/IcVaccineEntity.java     | 5 +++++
 .../java/com/epmet/service/impl/IcVaccineServiceImpl.java   | 6 +++---
 .../src/main/resources/mapper/IcVaccineDao.xml              | 4 +++-
 5 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcVaccineDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcVaccineDTO.java
index 585b4ef550..115eeb2154 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcVaccineDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcVaccineDTO.java
@@ -47,6 +47,11 @@ public class IcVaccineDTO implements Serializable {
      */
 	private String isResiUser;
 
+    /**
+     * 数字社区的icResiUserId、其他情况无值
+     */
+    private String userId;
+
     /**
      * 数据来源【导入的：import;】
      */
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/AddIcVaccineFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/AddIcVaccineFormDTO.java
index 1f6eea9602..860bb25aaf 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/AddIcVaccineFormDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/AddIcVaccineFormDTO.java
@@ -27,8 +27,8 @@ public class AddIcVaccineFormDTO implements Serializable {
     /**
      * 核酸记录Id,修改时使用
      */
-    @NotBlank(message = "组织Id不能为空", groups = Edit.class)
-    private String icVaccineId;
+    @NotBlank(message = "核酸记录Id不能为空", groups = Edit.class)
+    private String vaccineId;
     /**
      * 当前网格所属组织Id
      */
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcVaccineEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcVaccineEntity.java
index 215fd77173..b17256f3a0 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcVaccineEntity.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcVaccineEntity.java
@@ -48,6 +48,11 @@ public class IcVaccineEntity extends BaseEpmetEntity {
      */
 	private String isResiUser;
 
+	/**
+	 * 数字社区的icResiUserId、其他情况无值
+	 */
+	private String userId;
+
     /**
      * 数据来源【导入的：import;】
      */
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 d5ed007528..09da4b8ee2 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
@@ -525,15 +525,15 @@ public class IcVaccineServiceImpl extends BaseServiceImpl<IcVaccineDao, IcVaccin
     @Override
     public void edit(AddIcVaccineFormDTO formDTO) {
         //0.先根据身份证号和接种时间校验除当前数据是否还存在相同数据
-        IcVaccineDTO icVaccineDTO = baseDao.getVaccineDTO(formDTO.getCustomerId(), formDTO.getIcVaccineId(), formDTO.getIdCard(), DateUtils.format(formDTO.getInoculateTime(), DateUtils.DATE_TIME_PATTERN_END_WITH_MINUTE));
+        IcVaccineDTO icVaccineDTO = baseDao.getVaccineDTO(formDTO.getCustomerId(), formDTO.getVaccineId(), formDTO.getIdCard(), DateUtils.format(formDTO.getInoculateTime(), DateUtils.DATE_TIME_PATTERN_END_WITH_MINUTE));
         if (null != icVaccineDTO) {
             throw new RenException(EpmetErrorCode.IC_VACCINE.getCode(), EpmetErrorCode.IC_VACCINE.getMsg());
         }
         //1.更新核酸记录基础信息表数据
         IcVaccineEntity entity = ConvertUtils.sourceToTarget(formDTO, IcVaccineEntity.class);
-        entity.setId(formDTO.getIcVaccineId());
+        entity.setId(formDTO.getVaccineId());
         if (!updateById(entity)) {
-            log.error(String.format("数据修改失败,核酸记录Id->%s", formDTO.getIcVaccineId()));
+            log.error(String.format("数据修改失败,核酸记录Id->%s", formDTO.getVaccineId()));
             throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "疫苗接种记录信息修改失败");
         }
         //修改只涉及到基础信息的修改 不会修改关系数据 关系表不涉及更新
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 2beda4364d..13b3fa3f75 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
@@ -40,7 +40,8 @@
             b.id_card,
             b.INOCULATE_TIME,
             b.INOCULATE_ADDRESS,
-            b.MANUFACTURER
+            b.MANUFACTURER,
+            b.user_id,
         FROM ic_vaccine_relation a
         INNER JOIN ic_vaccine b ON a.IC_VACCINE_ID = b.ID AND b.DEL_FLAG = '0'
         WHERE a.DEL_FLAG = '0'
@@ -71,6 +72,7 @@
         SELECT
             id vaccineId,
             is_resi_user isResiUser,
+            user_id userId,
             user_type userType,
             `name` `name`,
             mobile mobile,