From 71553b7a81bec9b95d4ab1a2f77e3d8d570e2bc3 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Thu, 20 Oct 2022 13:05:33 +0800
Subject: [PATCH] =?UTF-8?q?7=E3=80=81=E6=A0=B8=E9=85=B8=E6=A3=80=E6=B5=8B?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95=E8=AF=A6=E6=83=85=EF=BC=9A/epmetuser/icNat/d?=
 =?UTF-8?q?etail=E8=BF=94=E5=9B=9Eshow?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/epmet/dto/IcNatDTO.java            | 9 +++++++++
 .../main/java/com/epmet/controller/IcNatController.java  | 1 +
 .../java/com/epmet/service/impl/IcNatServiceImpl.java    | 3 ++-
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcNatDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcNatDTO.java
index dbd32f4463..0b0e41294e 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcNatDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcNatDTO.java
@@ -61,6 +61,15 @@ public class IcNatDTO implements Serializable {
      */
     private String idCard;
 
+    /**
+     * 脱敏详情用
+     */
+    private String showMobile;
+    /**
+     * 脱敏详情用
+     */
+    private String showIdCard;
+
     /**
      * 检测时间，精确到分钟
      */
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcNatController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcNatController.java
index bcb2a2d134..a365373784 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcNatController.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcNatController.java
@@ -125,6 +125,7 @@ public class IcNatController implements ResultDataResolver {
      * @Author sun
      * @Description 【核酸】核酸检测信息详情
      **/
+    @MaskResponse(fieldNames = { "showMobile", "showIdCard" }, fieldsMaskType = { MaskResponse.MASK_TYPE_MOBILE, MaskResponse.MASK_TYPE_ID_CARD })
     @NoRepeatSubmit
     @PostMapping("detail")
     public Result<IcNatDTO> detail(@RequestBody MyNatListFormDTO formDTO) {
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNatServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNatServiceImpl.java
index 40d9818db8..622157306c 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNatServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNatServiceImpl.java
@@ -198,7 +198,8 @@ public class IcNatServiceImpl extends BaseServiceImpl<IcNatDao, IcNatEntity> imp
             return resultDTO;
         }
         resultDTO = ConvertUtils.sourceToTarget(entity, IcNatDTO.class);
-
+        resultDTO.setShowIdCard(resultDTO.getIdCard());
+        resultDTO.setShowMobile(resultDTO.getMobile());
         //2.查询对应的通知记录信息
         IcNoticeDTO dto = icNoticeService.getNotice(entity.getCustomerId(), entity.getIdCard());
         if (null != dto) {