教练端提交审核

fx-admin/src/main/java/com/miaxis/h5/controller/coach/CoachInfoController.java

@@ -2,8 +2,15 @@ package com.miaxis.h5.controller.coach;
 
 import java.util.List;
 import java.util.Arrays;
+
+import com.miaxis.coach.dto.CoachAuditDTO;
+import com.miaxis.common.constant.Constants;
+import com.miaxis.common.core.domain.entity.UserInfo;
+import com.miaxis.common.utils.SecurityUtils;
+import com.sun.org.apache.bcel.internal.classfile.Constant;
 import io.swagger.annotations.*;
 import com.miaxis.common.core.domain.Response;
+import org.springframework.beans.BeanUtils;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -30,40 +37,40 @@ import com.miaxis.common.core.page.ResponsePageInfo;
  * @date 2022-05-10
  */
 @RestController
-@RequestMapping("/coach/info")
+@RequestMapping(Constants.COACH_PREFIX+"/coach/info")
 @Api(tags={"【H5-教练用户】"})
 public class CoachInfoController extends BaseController{
     @Autowired
     private ICoachInfoService coachInfoService;
 
-    /**
-     * 查询教练用户列表
-     */
-    @PreAuthorize("@ss.hasPermi('coach:info:list')")
-    @GetMapping("/list")
-    @ApiOperation("查询教练用户列表")
-        @ApiImplicitParams({
-            @ApiImplicitParam(name = "pageNum",value = "当前页码" ,dataType = "int", paramType = "query", required = false),
-            @ApiImplicitParam(name = "pageSize",value = "每页数据量" , dataType = "int", paramType = "query", required = false),
-    })
-    public ResponsePageInfo<CoachInfo> list(@ModelAttribute CoachInfo coachInfo){
-        startPage();
-        List<CoachInfo> list = coachInfoService.selectCoachInfoList(coachInfo);
-        return toResponsePageInfo(list);
-    }
+//    /**
+//     * 查询教练用户列表
+//     */
+//    @PreAuthorize("@ss.hasPermi('coach:info:list')")
+//    @GetMapping("/list")
+//    @ApiOperation("查询教练用户列表")
+//        @ApiImplicitParams({
+//            @ApiImplicitParam(name = "pageNum",value = "当前页码" ,dataType = "int", paramType = "query", required = false),
+//            @ApiImplicitParam(name = "pageSize",value = "每页数据量" , dataType = "int", paramType = "query", required = false),
+//    })
+//    public ResponsePageInfo<CoachInfo> list(@ModelAttribute CoachInfo coachInfo){
+//        startPage();
+//        List<CoachInfo> list = coachInfoService.selectCoachInfoList(coachInfo);
+//        return toResponsePageInfo(list);
+//    }
 
-    /**
-     * 导出教练用户列表
-     */
-    @PreAuthorize("@ss.hasPermi('coach:info:export')")
-    @Log(title = "教练用户", businessType = BusinessTypeEnum.EXPORT)
-    @GetMapping("/export")
-    @ApiOperation("导出教练用户列表Excel")
-    public Response<String> export(@ModelAttribute CoachInfo coachInfo){
-        List<CoachInfo> list = coachInfoService.selectCoachInfoList(coachInfo);
-        ExcelUtil<CoachInfo> util = new ExcelUtil<CoachInfo>(CoachInfo.class);
-        return util.exportExcel(list, "info");
-    }
+//    /**
+//     * 导出教练用户列表
+//     */
+//    @PreAuthorize("@ss.hasPermi('coach:info:export')")
+//    @Log(title = "教练用户", businessType = BusinessTypeEnum.EXPORT)
+//    @GetMapping("/export")
+//    @ApiOperation("导出教练用户列表Excel")
+//    public Response<String> export(@ModelAttribute CoachInfo coachInfo){
+//        List<CoachInfo> list = coachInfoService.selectCoachInfoList(coachInfo);
+//        ExcelUtil<CoachInfo> util = new ExcelUtil<CoachInfo>(CoachInfo.class);
+//        return util.exportExcel(list, "info");
+//    }
 
     /**
      * 获取教练用户详细信息
@@ -77,40 +84,42 @@ public class CoachInfoController extends BaseController{
     ){
         return Response.success(coachInfoService.getById(id));
     }
-
-    /**
-     * 新增教练用户
-     */
-    @PreAuthorize("@ss.hasPermi('coach:info:add')")
-    @Log(title = "教练用户", businessType = BusinessTypeEnum.INSERT)
-    @PostMapping
-    @ApiOperation("新增教练用户")
-    public Response<Integer> add(@RequestBody CoachInfo coachInfo){
-        return toResponse(coachInfoService.save(coachInfo) ? 1 : 0);
-    }
+//
+//    /**
+//     * 新增教练用户
+//     */
+//    @PreAuthorize("@ss.hasPermi('coach:info:add')")
+//    @Log(title = "教练用户", businessType = BusinessTypeEnum.INSERT)
+//    @PostMapping
+//    @ApiOperation("新增教练用户")
+//    public Response<Integer> add(@RequestBody CoachInfo coachInfo){
+//        return toResponse(coachInfoService.save(coachInfo) ? 1 : 0);
+//    }
 
     /**
      * 修改教练用户
      */
-    @PreAuthorize("@ss.hasPermi('coach:info:edit')")
+//    @PreAuthorize("@ss.hasPermi('coach:info:edit')")
     @Log(title = "教练用户", businessType = BusinessTypeEnum.UPDATE)
     @PutMapping
     @ApiOperation("修改教练用户")
-    public Response<Integer> edit(@RequestBody CoachInfo coachInfo){
+    public Response<Integer> edit(@RequestBody CoachAuditDTO coachAuditDTO){
+        CoachInfo coachInfo= SecurityUtils.getLoginUser().getCoach();
+        BeanUtils.copyProperties(coachAuditDTO,coachInfo);
         return toResponse(coachInfoService.updateById(coachInfo) ? 1 : 0);
     }
 
-    /**
-     * 删除教练用户
-     */
-    @PreAuthorize("@ss.hasPermi('coach:info:remove')")
-    @Log(title = "教练用户", businessType = BusinessTypeEnum.DELETE)
-	@DeleteMapping("/{ids}")
-    @ApiOperation("删除教练用户")
-    public  Response<Integer> remove(
-            @ApiParam(name = "ids", value = "教练用户ids参数", required = true)
-            @PathVariable Long[] ids
-    ){
-        return toResponse(coachInfoService.removeByIds(Arrays.asList(ids)) ? 1 : 0);
-    }
+//    /**
+//     * 删除教练用户
+//     */
+//    @PreAuthorize("@ss.hasPermi('coach:info:remove')")
+//    @Log(title = "教练用户", businessType = BusinessTypeEnum.DELETE)
+//	@DeleteMapping("/{ids}")
+//    @ApiOperation("删除教练用户")
+//    public  Response<Integer> remove(
+//            @ApiParam(name = "ids", value = "教练用户ids参数", required = true)
+//            @PathVariable Long[] ids
+//    ){
+//        return toResponse(coachInfoService.removeByIds(Arrays.asList(ids)) ? 1 : 0);
+//    }
 }

fx-common/src/main/java/com/miaxis/common/constant/Constants.java

@@ -178,6 +178,12 @@ public class Constants
      */
     public static final String STUDENT_PREFIX = "/student";
 
+
+    /**
+     * 教练权限路径
+     */
+    public static final String COACH_PREFIX = "/coach";
+
     /**
      * VIP
      */

fx-common/src/main/java/com/miaxis/common/core/domain/entity/CoachInfo.java

@@ -134,6 +134,18 @@ public class CoachInfo extends BaseBusinessEntity{
     @ApiModelProperty(value = "小程序openid")
     private String xcxOpenid;
 
+    /** 小程序openid */
+    @Excel(name = "身份证")
+    @TableField("id_card")
+    @ApiModelProperty(value = "身份证")
+    private String idCard;
+
+
+    @Excel(name = "审核状态 0-未提交审核 1-审核中 2-审核通过 3-审核驳回")
+    @TableField("audit_status")
+    @ApiModelProperty(value = "审核状态 0-未提交审核 1-审核中 2-审核通过 3-审核驳回")
+    private Integer auditStatus;
+
     public void setId(Long id){
         this.id = id;
     }

fx-service/src/main/java/com/miaxis/coach/dto/CoachAuditDTO.java

@@ -0,0 +1,47 @@
+package com.miaxis.coach.dto;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.miaxis.common.annotation.Excel;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+
+@Data
+@ApiModel(value = "CoachAuditDTO", description = "教练申请审核对象 CoachAuditDTO")
+public class CoachAuditDTO {
+    private static final long serialVersionUID = 1L;
+
+
+    /** 手机号码 */
+    @Excel(name = "手机号码")
+    @TableField("phone")
+    @ApiModelProperty(value = "手机号码")
+    private String phone;
+
+
+
+    /** 用户真实姓名 */
+    @Excel(name = "用户真实姓名")
+    @TableField("real_name")
+    @ApiModelProperty(value = "用户真实姓名")
+    private String realName;
+
+
+
+
+    /** 所属驾校名称 */
+    @Excel(name = "所属驾校名称")
+    @TableField("school_name")
+    @ApiModelProperty(value = "所属驾校名称")
+    private String schoolName;
+
+
+    /** 小程序openid */
+    @Excel(name = "身份证")
+    @TableField("id_card")
+    @ApiModelProperty(value = "身份证")
+    private String idCard;
+
+
+}