屏蔽志愿者手机号

leromro-admin/src/main/java/com/leromro/web/controller/system/SysUserController.java

@@ -3,6 +3,9 @@ package com.leromro.web.controller.system;
 import java.util.List;
 import java.util.stream.Collectors;
 import javax.servlet.http.HttpServletResponse;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.ArrayUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -38,6 +41,7 @@ import com.leromro.system.service.ISysUserService;
  * @author ruoyi
  */
 @RestController
+@Api(tags = "用户接口")
 @RequestMapping("/system/user")
 public class SysUserController extends BaseController
 {
@@ -66,6 +70,7 @@ public class SysUserController extends BaseController
     }
 
 
+    @ApiOperation("后台客户列表接口")
     @GetMapping("/userList")
     public TableDataInfo<SysUser> userList(SysUser user)
     {

leromro-core/src/main/java/com/leromro/core/domain/VolunteerInfo.java

@@ -47,7 +47,7 @@ public class VolunteerInfo extends BaseEntity {
     @ApiModelProperty(value = "志愿者姓名")
     private String name;
 
-    @Sensitive(desensitizedType = DesensitizedType.ID_CARD)
+//    @Sensitive(desensitizedType = DesensitizedType.ID_CARD)
     @ApiModelProperty(value = "身份证号")
     private String idCard;
 
@@ -69,7 +69,7 @@ public class VolunteerInfo extends BaseEntity {
     @ApiModelProperty(value = "技能描述")
     private String skillDescribe;
 
-    @Sensitive(desensitizedType = DesensitizedType.PHONE)
+//    @Sensitive(desensitizedType = DesensitizedType.PHONE)
     @ApiModelProperty(value = "联系电话")
     private String phonenumber;
 

leromro-core/src/main/java/com/leromro/core/domain/vo/VolunteerInfoDetailVO.java

@@ -1,6 +1,10 @@
 package com.leromro.core.domain.vo;
 
+import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.leromro.common.annotation.Sensitive;
+import com.leromro.common.enums.DesensitizedType;
 import com.leromro.core.domain.VolunteerInfo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -12,12 +16,100 @@ import java.math.BigDecimal;
  * 志愿者详情VO
  */
 @Data
-@EqualsAndHashCode(callSuper = true)
-public class VolunteerInfoDetailVO extends VolunteerInfo {
+public class VolunteerInfoDetailVO {
 
     @ApiModelProperty("业务价格")
     private BigDecimal businessPrice;
 
     @ApiModelProperty("业务时长(整数分钟)")
     private Integer businessDuration;
+
+    @ApiModelProperty(value = "主键id")
+    @TableId(value = "volunteer_info_id", type = IdType.AUTO)
+    private Long volunteerInfoId;
+
+    @ApiModelProperty(value = "用户id")
+    private Long volunteerId;
+
+    @ApiModelProperty(value = "志愿者姓名")
+    private String name;
+
+    @Sensitive(desensitizedType = DesensitizedType.ID_CARD)
+    @ApiModelProperty(value = "身份证号")
+    private String idCard;
+
+    @ApiModelProperty(value = "照片")
+    private String idCardPicture;
+
+    @ApiModelProperty(value = "评分")
+    private Double score;
+
+    @ApiModelProperty(value = "大类别")
+    private Long serviceCategory;
+
+    @ApiModelProperty(value = "小类别")
+    private Long serviceType;
+
+    @ApiModelProperty(value = "学科科目")
+    private Long serviceSubject;
+
+    @ApiModelProperty(value = "技能描述")
+    private String skillDescribe;
+
+    @Sensitive(desensitizedType = DesensitizedType.PHONE)
+    @ApiModelProperty(value = "联系电话")
+    private String phonenumber;
+
+    @ApiModelProperty(value = "性别 0女 1男")
+    private Integer sex;
+
+    @ApiModelProperty(value = "年龄")
+    private Integer age;
+
+    @ApiModelProperty(value = "状态 0 不接单  1 正在接单")
+    private Integer status;
+
+    @ApiModelProperty(value = "证书图片")
+    private String certificationPicture;
+
+    @ApiModelProperty(value = "志愿者照片")
+    private String volunteerPicture;
+
+    @ApiModelProperty(value = "之前工作过的单位")
+    private String workedCompany;
+
+    @ApiModelProperty(value = "职称")
+    private String level;
+
+    @ApiModelProperty(value = "是否在职 0 否 1是")
+    private Integer isOnJob;
+
+    @ApiModelProperty(value = "地区")
+    private String city;
+
+    @ApiModelProperty(value = "详细地址")
+    private String address;
+
+    @ApiModelProperty(value = "业务id")
+    private Long businessManagementId;
+
+    @ApiModelProperty(value = "审批状态 1待审批2已通过3已驳回")
+    private String appStatus;
+
+    @ApiModelProperty(value = "驳回原因")
+    private String rejectReason;
+
+    @TableField("project_name")
+    @ApiModelProperty("服务项目名称")
+    private String projectName;
+
+    @TableField("project_type_name")
+    @ApiModelProperty("项目类别名称")
+    private String  projectTypeName;
+
+    @ApiModelProperty("科目名称")
+    private String serviceSubjectName;
+
+    @ApiModelProperty("业务层级名称")
+    private String businessTierName;
 }

leromro-core/src/main/java/com/leromro/core/domain/vo/webMainOrderListVO.java

@@ -6,6 +6,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.math.BigDecimal;
+import java.util.Date;
 
 /**
  * 后台管理订单页面
@@ -43,4 +44,7 @@ public class webMainOrderListVO {
 
     @ApiModelProperty("业务层级名称")
     private String businessTierName;
+
+    @ApiModelProperty("订单创建时间")
+    private Date createTime;
 }