From c60027a17871789864573cc46ebbbc438bcd59f0 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Thu, 20 Oct 2022 12:32:39 +0800
Subject: [PATCH] =?UTF-8?q?/epmetuser/tripreport/detail=E5=BD=A2=E6=88=90?=
 =?UTF-8?q?=E4=B8=8A=E6=8A=A5=E8=BF=94=E5=9B=9EshowMobile=E3=80=81showIdCa?=
 =?UTF-8?q?rd?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/epmet/dto/IcTripReportRecordDTO.java    | 8 ++++----
 .../epmet/controller/IcTripReportRecordController.java    | 2 +-
 .../epmet/service/impl/IcTripReportRecordServiceImpl.java | 7 ++++++-
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcTripReportRecordDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcTripReportRecordDTO.java
index 9d2ab97099..ea4a456f41 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcTripReportRecordDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcTripReportRecordDTO.java
@@ -77,9 +77,9 @@ public class IcTripReportRecordDTO implements Serializable {
 	private String mobile;
 
     /**
-     * 真实手机号不打码
+     * 脱敏
      */
-    private String realMobile;
+    private String showMobile;
 
     /**
      * 身份证号
@@ -89,9 +89,9 @@ public class IcTripReportRecordDTO implements Serializable {
 	private String idCard;
 
     /**
-     * 真实身份证号
+     * 脱敏
      */
-    private String realIdCard;
+    private String showIdCard;
 
     /**
      * 用户id
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcTripReportRecordController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcTripReportRecordController.java
index 5e4aba1748..02bc139e51 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcTripReportRecordController.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcTripReportRecordController.java
@@ -88,7 +88,7 @@ public class IcTripReportRecordController implements ResultDataResolver {
      * @param formDTO
      * @return
      */
-    @MaskResponse(fieldNames = { "mobile", "idCard" }, fieldsMaskType = { MaskResponse.MASK_TYPE_MOBILE, MaskResponse.MASK_TYPE_ID_CARD })
+    @MaskResponse(fieldNames = { "showMobile", "showIdCard" }, fieldsMaskType = { MaskResponse.MASK_TYPE_MOBILE, MaskResponse.MASK_TYPE_ID_CARD })
     @PostMapping("detail")
     public Result<IcTripReportRecordDTO> detail(@LoginUser TokenDto tokenDto,@RequestBody IcTripReportRecordDTO formDTO){
         ValidatorUtils.validateEntity(formDTO,IcTripReportRecordDTO.DetailViewGroup.class);
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java
index a758fdba92..bd920882f0 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java
@@ -464,6 +464,11 @@ public class IcTripReportRecordServiceImpl extends BaseServiceImpl<IcTripReportR
                 dto.setLatestNoticeTime(latestNotice.get(dto.getIdCard()));
             }
         }
-        return list.get(NumConstant.ZERO);
+        IcTripReportRecordDTO resultDto=list.get(NumConstant.ZERO);
+        if(null!=resultDto){
+            resultDto.setShowIdCard(resultDto.getIdCard());
+            resultDto.setShowMobile(resultDto.getMobile());
+        }
+        return resultDto;
     }
 }