修改手机号申请列表增加applySource字段

src/main/java/cn/quantgroup/xyqb/controller/modifyphoneno/ModifyPhoneNoController.java

@@ -2,6 +2,7 @@ package cn.quantgroup.xyqb.controller.modifyphoneno;
 
 import cn.quantgroup.xyqb.controller.IBaseController;
 import cn.quantgroup.xyqb.controller.modifyphoneno.req.*;
+import cn.quantgroup.xyqb.controller.modifyphoneno.resp.ModifyPhoneNoResp;
 import cn.quantgroup.xyqb.controller.modifyphoneno.resp.ProgressResp;
 import cn.quantgroup.xyqb.controller.modifyphoneno.resp.UserModifyPhoneRecordResp;
 import cn.quantgroup.xyqb.entity.ModifyPhoneNo;
@@ -83,7 +84,8 @@ public class ModifyPhoneNoController implements IBaseController {
         objectMapper.setDateFormat(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"));
         String s;
         try {
-            s = objectMapper.writeValueAsString(list);
+            Page<ModifyPhoneNoResp> result = list.map(ModifyPhoneNoResp::from);
+            s = objectMapper.writeValueAsString(result);
             Object o = objectMapper.readValue(s, Object.class);
             return JsonResult.buildSuccessResultGeneric(o);
         } catch (Exception ignored) {

src/main/java/cn/quantgroup/xyqb/controller/modifyphoneno/resp/ModifyPhoneNoResp.java

 package cn.quantgroup.xyqb.controller.modifyphoneno.resp;
 
+import cn.quantgroup.xyqb.entity.ModifyPhoneNo;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import java.sql.Timestamp;
 import java.util.Date;
 import lombok.Data;
 
@@ -11,31 +14,94 @@ import lombok.Data;
  */
 @Data
 public class ModifyPhoneNoResp {
+
+    private static final long serialVersionUID = 0x93c999d06b6f64d2L;
+
+
     private Long id;
-//    //@ApiModelProperty("申请编号")
-    private String applyNo;
-//    //@ApiModelProperty("申请人姓名")
+
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    private Timestamp createdAt;
+
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    private Timestamp updatedAt;
+
+    /**
+     * user.id
+     */
+    private Long userId;
+
+    /**
+     * 注册人真实姓名
+     */
     private String name;
-//    //@ApiModelProperty("申请人身份证号")
+
+    /**
+     * 注册人身份证件号
+     */
     private String idCard;
-    //@ApiModelProperty("申请人原手机号")
+
+    /**
+     * 原手机号码
+     */
     private String prevPhoneNo;
-    //@ApiModelProperty("申请人现手机号")
+
+    /**
+     * 新手机号码
+     */
     private String curPhoneNo;
-    //@ApiModelProperty("申请时间")
-    private Date createdAt;
-    //@ApiModelProperty("申请结果")
-    private Integer applyStatus;
-    //@ApiModelProperty("拒绝原因")
-    private String applyStatusReason;
-    //@ApiModelProperty("处理状态")
-    private Integer processStatus;
-    //@ApiModelProperty("最近更新时间")
-    private Date updatedAt;
-    //@ApiModelProperty("身份证正面")
+
+    /**
+     * 身份证正面
+     */
     private String idCardFaceUrl;
-    //@ApiModelProperty("身份证背面")
+
+    /**
+     * 身份证背面
+     */
     private String idCardRearUrl;
-    //@ApiModelProperty("本人手持身份证照片")
+
+    /**
+     * 本人手持身份证照片
+     */
     private String idCardHoldUrl;
+
+    /**
+     * 申请状态 0处理中; 1修改完成; 2不允许修改;
+     */
+    private Integer applyStatus;
+
+    /**
+     * 申请状态补充原因
+     */
+    private String applyStatusReason;
+
+    /**
+     * 处理状态 0待人工处理 1待用户反馈结果 2已反馈
+     */
+    private Integer processingStatus;
+    /**
+     * 申请来源
+     */
+    private Integer applySource;
+
+    public static ModifyPhoneNoResp from(ModifyPhoneNo modifyPhoneNo){
+        ModifyPhoneNoResp modifyPhoneNoResp = new ModifyPhoneNoResp();
+        modifyPhoneNoResp.setId(modifyPhoneNo.getId());
+        modifyPhoneNoResp.setCreatedAt(modifyPhoneNo.getCreatedAt());
+        modifyPhoneNoResp.setUpdatedAt(modifyPhoneNo.getUpdatedAt());
+        modifyPhoneNoResp.setUserId(modifyPhoneNo.getUserId());
+        modifyPhoneNoResp.setName(modifyPhoneNo.getName());
+        modifyPhoneNoResp.setIdCard(modifyPhoneNo.getIdCard());
+        modifyPhoneNoResp.setPrevPhoneNo(modifyPhoneNo.getPrevPhoneNo());
+        modifyPhoneNoResp.setCurPhoneNo(modifyPhoneNo.getCurPhoneNo());
+        modifyPhoneNoResp.setIdCardFaceUrl(modifyPhoneNo.getIdCardFaceUrl());
+        modifyPhoneNoResp.setIdCardRearUrl(modifyPhoneNo.getIdCardRearUrl());
+        modifyPhoneNoResp.setIdCardHoldUrl(modifyPhoneNo.getIdCardHoldUrl());
+        modifyPhoneNoResp.setApplyStatus(modifyPhoneNo.getApplyStatus());
+        modifyPhoneNoResp.setApplyStatusReason(modifyPhoneNo.getApplyStatusReason());
+        modifyPhoneNoResp.setProcessingStatus(modifyPhoneNo.getProcessingStatus());
+        modifyPhoneNoResp.setApplySource(modifyPhoneNo.getApplySource().ordinal());
+        return modifyPhoneNoResp;
+    }
 }