/epmetuser/tripreport/detail形成上报返回showMobile、showIdCard

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

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);

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;
     }
 }