From dda6af3edbd4713353e916c5570df5a7356342fe Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Thu, 30 Jun 2022 14:00:15 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E5=89=8D=E5=90=8E=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E5=AF=B9=E6=AF=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../EpidemicUserInfoAuditController.java      |  7 ++--
 .../epidemic/dao/EpidemicUserInfoDao.java     | 12 ++++++
 .../service/EpidemicUserInfoAuditService.java |  3 +-
 .../service/EpidemicUserInfoService.java      | 11 ++++++
 .../EpidemicUserInfoAuditServiceImpl.java     | 23 +++++++++--
 .../impl/EpidemicUserInfoServiceImpl.java     |  5 +++
 .../mapper/epidemic/EpidemicUserInfoDao.xml   | 38 +++++++++++++++++++
 7 files changed, 92 insertions(+), 7 deletions(-)

diff --git a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/controller/EpidemicUserInfoAuditController.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/controller/EpidemicUserInfoAuditController.java
index 739b7a2..f6f3049 100644
--- a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/controller/EpidemicUserInfoAuditController.java
+++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/controller/EpidemicUserInfoAuditController.java
@@ -26,6 +26,7 @@ import com.elink.esua.epdc.commons.tools.validator.group.AddGroup;
 import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup;
 import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup;
 import com.elink.esua.epdc.dto.EpidemicUserInfoAuditDTO;
+import com.elink.esua.epdc.dto.epidemic.result.EpidemicUserInfoAuditResultDTO;
 import com.elink.esua.epdc.vaccine.epidemic.service.EpidemicUserInfoAuditService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -53,9 +54,9 @@ public class EpidemicUserInfoAuditController {
     }
 
     @GetMapping("{id}")
-    public Result<EpidemicUserInfoAuditDTO> get(@PathVariable("id") String id){
-        EpidemicUserInfoAuditDTO data = epidemicUserInfoAuditService.get(id);
-        return new Result<EpidemicUserInfoAuditDTO>().ok(data);
+    public Result<EpidemicUserInfoAuditResultDTO> get(@PathVariable("id") String id){
+        EpidemicUserInfoAuditResultDTO data = epidemicUserInfoAuditService.get(id);
+        return new Result<EpidemicUserInfoAuditResultDTO>().ok(data);
     }
 
     @PostMapping
diff --git a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/dao/EpidemicUserInfoDao.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/dao/EpidemicUserInfoDao.java
index 807c604..26e36ec 100644
--- a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/dao/EpidemicUserInfoDao.java
+++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/dao/EpidemicUserInfoDao.java
@@ -2,6 +2,7 @@ package com.elink.esua.epdc.vaccine.epidemic.dao;
 
 
 import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
+import com.elink.esua.epdc.dto.EpidemicUserInfoAuditDTO;
 import com.elink.esua.epdc.dto.personroom.EpidemicUnitOwnerDTO;
 import com.elink.esua.epdc.dto.personroom.form.GetMemberListFormDTO;
 import com.elink.esua.epdc.dto.personroom.result.FamilyMemberInfoResultDTO;
@@ -79,6 +80,16 @@ public interface EpidemicUserInfoDao extends BaseDao<EpidemicUserInfoEntity> {
      */
     EpidemicUserInfoEntity selectInfoByIdCard(@Param("idCard") String idCard);
 
+    /**
+     * 获取审核前的数据
+     *
+     * @param idCard
+     * @return com.elink.esua.epdc.dto.EpidemicUserInfoAuditDTO
+     * @author zhy
+     * @date 2022/6/30 10:34
+     */
+    EpidemicUserInfoAuditDTO getAuditByIdCard(@Param("idCard") String idCard);
+
     /**
      * 根据身份证号查询信息
      *
@@ -262,6 +273,7 @@ public interface EpidemicUserInfoDao extends BaseDao<EpidemicUserInfoEntity> {
 
     /**
      * 获取成员信息
+     *
      * @param formDTO
      * @return
      */
diff --git a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/EpidemicUserInfoAuditService.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/EpidemicUserInfoAuditService.java
index 9e1297b..ac6730f 100644
--- a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/EpidemicUserInfoAuditService.java
+++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/EpidemicUserInfoAuditService.java
@@ -21,6 +21,7 @@ package com.elink.esua.epdc.vaccine.epidemic.service;
 import com.elink.esua.epdc.commons.mybatis.service.BaseService;
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.dto.EpidemicUserInfoAuditDTO;
+import com.elink.esua.epdc.dto.epidemic.result.EpidemicUserInfoAuditResultDTO;
 import com.elink.esua.epdc.vaccine.epidemic.entity.EpidemicUserInfoAuditEntity;
 
 import java.util.List;
@@ -62,7 +63,7 @@ public interface EpidemicUserInfoAuditService extends BaseService<EpidemicUserIn
      * @author generator
      * @date 2022-06-29
      */
-    EpidemicUserInfoAuditDTO get(String id);
+    EpidemicUserInfoAuditResultDTO get(String id);
 
     /**
      * 单条查询
diff --git a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/EpidemicUserInfoService.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/EpidemicUserInfoService.java
index 8b25514..e3a80f7 100644
--- a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/EpidemicUserInfoService.java
+++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/EpidemicUserInfoService.java
@@ -4,6 +4,7 @@ package com.elink.esua.epdc.vaccine.epidemic.service;
 import com.elink.esua.epdc.commons.mybatis.service.CrudService;
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.EpidemicUserInfoAuditDTO;
 import com.elink.esua.epdc.dto.personroom.EpidemicUnitOwnerDTO;
 import com.elink.esua.epdc.dto.personroom.form.BindingFamilyFormDTO;
 import com.elink.esua.epdc.dto.personroom.form.FamilyMemberInfoFormDTO;
@@ -163,6 +164,16 @@ public interface EpidemicUserInfoService extends CrudService<EpidemicUserInfoEnt
      */
     EpidemicUserInfoEntity getByIdCard(String idCard);
 
+    /**
+     * 根据身份证查找用户
+     *
+     * @param idCard
+     * @return com.elink.esua.epdc.vaccine.epidemic.entity.EpidemicUserInfoEntity
+     * @author zhy
+     * @date 2021/9/9 13:34
+     */
+    EpidemicUserInfoAuditDTO getAuditByIdCard(String idCard);
+
     /**
      * 根据身份证查找用户
      *
diff --git a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/impl/EpidemicUserInfoAuditServiceImpl.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/impl/EpidemicUserInfoAuditServiceImpl.java
index d19a281..c2ac91e 100644
--- a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/impl/EpidemicUserInfoAuditServiceImpl.java
+++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/impl/EpidemicUserInfoAuditServiceImpl.java
@@ -25,6 +25,7 @@ import com.elink.esua.epdc.commons.tools.constant.NumConstant;
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
 import com.elink.esua.epdc.dto.EpidemicUserInfoAuditDTO;
+import com.elink.esua.epdc.dto.epidemic.result.EpidemicUserInfoAuditResultDTO;
 import com.elink.esua.epdc.dto.personroom.form.FamilyMemberInfoFormDTO;
 import com.elink.esua.epdc.vaccine.epidemic.dao.EpidemicUserInfoAuditDao;
 import com.elink.esua.epdc.vaccine.epidemic.entity.EpidemicUserInfoAuditEntity;
@@ -85,9 +86,25 @@ public class EpidemicUserInfoAuditServiceImpl extends BaseServiceImpl<EpidemicUs
     }
 
     @Override
-    public EpidemicUserInfoAuditDTO get(String id) {
+    public EpidemicUserInfoAuditResultDTO get(String id) {
         EpidemicUserInfoAuditEntity entity = baseDao.selectById(id);
-        return ConvertUtils.sourceToTarget(entity, EpidemicUserInfoAuditDTO.class);
+        EpidemicUserInfoAuditResultDTO dto = ConvertUtils.sourceToTarget(entity, EpidemicUserInfoAuditResultDTO.class);
+        EpidemicUserInfoAuditDTO lastData = epidemicUserInfoService.getAuditByIdCard(dto.getIdCard());
+        if (lastData != null) {
+            dto.setLastAge(lastData.getAge());
+            dto.setLastUserName(lastData.getUserName());
+            dto.setLastIdCard(lastData.getIdCard());
+            dto.setLastGender(lastData.getGender());
+            dto.setLastMobile(lastData.getMobile());
+            dto.setLastNation(lastData.getNation());
+            dto.setLastHouseholdRegisterName(lastData.getHouseholdRegisterName());
+            dto.setLastHouseholdRegisterDetail(lastData.getHouseholdRegisterDetail());
+            dto.setLastRelation(lastData.getRelation());
+            dto.setLastOutLiveAddressName(lastData.getOutLiveAddressName());
+            dto.setLastOutLiveAddressDetail(lastData.getOutLiveAddressDetail());
+        }
+
+        return dto;
     }
 
     @Override
@@ -123,7 +140,7 @@ public class EpidemicUserInfoAuditServiceImpl extends BaseServiceImpl<EpidemicUs
         } else if (NumConstant.ONE_STR.equals(dto.getAuditType()) && NumConstant.FOUR_STR.equals(dto.getAuditState())) {
             epidemicUserInfoService.updateFamilyMember(formDTO);
         }
-        
+
         updateById(entity);
     }
 
diff --git a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/impl/EpidemicUserInfoServiceImpl.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/impl/EpidemicUserInfoServiceImpl.java
index d90ed34..2052662 100644
--- a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/impl/EpidemicUserInfoServiceImpl.java
+++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/impl/EpidemicUserInfoServiceImpl.java
@@ -657,6 +657,11 @@ public class EpidemicUserInfoServiceImpl extends CrudServiceImpl<EpidemicUserInf
         return baseDao.selectInfoByIdCard(idCard);
     }
 
+    @Override
+    public EpidemicUserInfoAuditDTO getAuditByIdCard(String idCard) {
+        return baseDao.getAuditByIdCard(idCard);
+    }
+
     @Override
     public List<EpidemicUserInfoEntity> listByIdCards(List<String> idCards) {
         return baseDao.listByIdCards(idCards);
diff --git a/epdc-cloud-vim-yushan/src/main/resources/mapper/epidemic/EpidemicUserInfoDao.xml b/epdc-cloud-vim-yushan/src/main/resources/mapper/epidemic/EpidemicUserInfoDao.xml
index 78f006a..a248e52 100644
--- a/epdc-cloud-vim-yushan/src/main/resources/mapper/epidemic/EpidemicUserInfoDao.xml
+++ b/epdc-cloud-vim-yushan/src/main/resources/mapper/epidemic/EpidemicUserInfoDao.xml
@@ -473,6 +473,44 @@
         where ID_CARD = #{idCard}
           and del_flag = '0' limit 1
     </select>
+    <select id="getAuditByIdCard" resultType="com.elink.esua.epdc.dto.EpidemicUserInfoAuditDTO">
+        SELECT
+            i.USER_NAME,
+            i.ID_CARD,
+            i.HOUSEHOLD_REGISTER_CODE,
+            i.HOUSEHOLD_REGISTER_NAME,
+            i.HOUSEHOLD_REGISTER_DETAIL,
+            i.GENDER,
+            i.NATION,
+            i.RELATION,
+            i.AGE,
+            i.LIVE_ADDRESS_CODE,
+            i.LIVE_ADDRESS_NAME,
+            i.COMMUNITY,
+            i.GRID_NAME,
+            i.MOBILE,
+            i.DEPT_ID,
+            i.DEPT_NAME,
+            i.PARENT_DEPT_IDS,
+            i.PARENT_DEPT_NAMES,
+            i.ALL_DEPT_IDS,
+            i.ALL_DEPT_NAMES,
+            i.PLOT,
+            i.BUILDING_NO,
+            i.UNIT,
+            i.ROOM_NO,
+            r.OUT_LIVE_ADDRESS_DETAIL,
+            r.OUT_LIVE_ADDRESS_CODE,
+            r.OUT_LIVE_ADDRESS_NAME
+        FROM
+            epidemic_user_info i
+            LEFT JOIN epidemic_user_inout_record r ON i.ID_CARD = r.ID_CARD
+        WHERE
+            i.ID_CARD = #{idCard}
+            AND i.DEL_FLAG = '0'
+            AND r.DEL_FLAG = '0'
+            LIMIT 1
+    </select>
     <select id="listByIdCards" resultMap="epidemicUserInfoMap">
         select *
         from epidemic_user_info