From 63bd61919493d2351cb1cf3f94a4b751b8d6d7e3 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Thu, 20 Oct 2022 12:03:49 +0800
Subject: [PATCH] =?UTF-8?q?3=E3=80=81=E7=96=AB=E8=8B=97=E6=8E=A5=E7=A7=8D?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95=E6=9F=A5=E7=9C=8B/epmetuser/icVaccine/detail?=
 =?UTF-8?q?=EF=BC=8CshowMobile,showIdCard=E5=8A=A0=E5=AF=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/epmet/dto/IcVaccineDTO.java        | 4 ++--
 .../java/com/epmet/controller/IcVaccineController.java   | 1 +
 .../com/epmet/service/impl/IcVaccineServiceImpl.java     | 9 ++++++---
 3 files changed, 9 insertions(+), 5 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 115eeb2154..b9dca879b0 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
@@ -36,12 +36,12 @@ public class IcVaccineDTO implements Serializable {
      * 手机号
      */
 	private String mobile;
-
+    private String showMobile;
     /**
      * 身份证号
      */
 	private String idCard;
-
+    private String showIdCard;
     /**
      * 是否客户下居民(0:否  1:是)
      */
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcVaccineController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcVaccineController.java
index bb34afd612..8c742919a7 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcVaccineController.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcVaccineController.java
@@ -231,6 +231,7 @@ public class IcVaccineController  implements ResultDataResolver {
      * @Author sun
      * @Description 疫苗接种情况-列表点击查询详情
      **/
+    @MaskResponse(fieldNames = { "showMobile", "showIdCard" }, fieldsMaskType = { MaskResponse.MASK_TYPE_MOBILE, MaskResponse.MASK_TYPE_ID_CARD })
     @NoRepeatSubmit
     @PostMapping("detail")
     public Result<IcVaccineDTO> detail(@RequestBody IcVaccineFormDTO formDTO) {
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 09da4b8ee2..6d183807ab 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
@@ -21,14 +21,12 @@ import com.epmet.constants.ImportTaskConstants;
 import com.epmet.dao.IcResiUserDao;
 import com.epmet.dao.IcVaccineDao;
 import com.epmet.dao.IcVaccineRelationDao;
-import com.epmet.dto.IcNatDTO;
 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.entity.IcNatEntity;
 import com.epmet.entity.IcResiUserEntity;
 import com.epmet.entity.IcVaccineEntity;
 import com.epmet.entity.IcVaccineRelationEntity;
@@ -480,7 +478,12 @@ public class IcVaccineServiceImpl extends BaseServiceImpl<IcVaccineDao, IcVaccin
     @Override
     public IcVaccineDTO detail(String vaccineId) {
         IcVaccineEntity entity = baseDao.selectById(vaccineId);
-        return ConvertUtils.sourceToTarget(entity, IcVaccineDTO.class);
+        IcVaccineDTO res=ConvertUtils.sourceToTarget(entity, IcVaccineDTO.class);
+        if(null!=res){
+            res.setShowIdCard(res.getIdCard());
+            res.setShowMobile(res.getMobile());
+        }
+        return res;
     }
 
     @Override