'教练员列表提交'

hzgzpt-admin/src/main/java/com/miaxis/app/controller/coach/CoachInfoController.java

@@ -1,6 +1,8 @@
 package com.miaxis.app.controller.coach;
 
 import com.miaxis.app.coach.domain.CoachInfo;
+import com.miaxis.app.coach.dto.CoachInfoDTO;
+import com.miaxis.app.coach.dto.CoachInfoVO;
 import com.miaxis.app.coach.service.ICoachInfoService;
 import com.miaxis.common.annotation.Log;
 import com.miaxis.common.core.controller.BaseController;
@@ -43,6 +45,25 @@ public class CoachInfoController extends BaseController{
         return toResponsePageInfo(list);
     }
 
+    /**
+     * 查询教练列表
+     */
+    //@PreAuthorize("@ss.hasPermi('coach:info:list')")
+    @GetMapping("/urlList")
+    @ApiOperation("查询教练列表（带头像距离）")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum",value = "当前页码" ,dataType = "int", paramType = "query", required = false),
+            @ApiImplicitParam(name = "pageSize",value = "每页数据量" , dataType = "int", paramType = "query", required = false),
+    })
+    public ResponsePageInfo<CoachInfoVO> urlList(@ModelAttribute CoachInfoDTO coachInfoDTO){
+        startPage();
+        List<CoachInfoVO> list = coachInfoService.selectCoachInfoUrlList(coachInfoDTO);
+        return toResponsePageInfo(list);
+    }
+
+
+
+
     /**
      * 导出教练列表
      */

hzgzpt-service-app/src/main/java/com/miaxis/app/coach/domain/CoachInfo.java

@@ -89,13 +89,7 @@ public class CoachInfo extends BaseBusinessEntity {
     @ApiModelProperty(value = "地区编号")
     private String district;
 
-    /** 供职状态：0:在职 1离职
-            1:离职
-            供职状态：0:在职
-            1:离职
-            
-            1:离职
-             */
+    /** 供职状态：0:在职 1离职*/
     @Excel(name = "供职状态：0:在职 1离职")
     @TableField("employstatus")
     @ApiModelProperty(value = "供职状态：0:在职 1离职")

hzgzpt-service-app/src/main/java/com/miaxis/app/coach/dto/CoachEvaluateDto.java

@@ -20,13 +20,13 @@ public class CoachEvaluateDto extends BaseBusinessEntity {
     private String coachnum;
 
     @ApiModelProperty(value = "态度星级")
-    private Long attitudeStarts;
+    private Long attitudeStars;
 
     @ApiModelProperty(value = "场级星级")
-    private Long areaStarts;
+    private Long areaStars;
 
     @ApiModelProperty(value = "总体星数：星星数1-5星")
-    private Long totalStarts;
+    private Long totalStars;
 
     @ApiModelProperty(value = "评价内容")
     private String content;

hzgzpt-service-app/src/main/java/com/miaxis/app/coach/dto/CoachInfoDTO.java

@@ -0,0 +1,46 @@
+package com.miaxis.app.coach.dto;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.miaxis.common.core.domain.BaseBusinessEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 教练对象 coach_info
+ *
+ * @author miaxis
+ * @date 2021-01-07
+ */
+@Data
+@ApiModel(value = "CoachInfoDTO", description = "教练对象 coach_info")
+public class CoachInfoDTO extends BaseBusinessEntity {
+    private static final long serialVersionUID = 1L;
+
+
+    /** 性别 ：1男  2女 */
+    @ApiModelProperty(value = "性别 ：1男  2女")
+    private Long sex;
+
+    /** 准教车型 */
+    @ApiModelProperty(value = "准教车型")
+    private String teachpermitted;
+
+    /** 当前经度 */
+    @ApiModelProperty(value = "当前经度")
+    private String lon;
+
+    /** 当前纬度 */
+    @ApiModelProperty(value = "当前纬度")
+    private String lat;
+
+    /** 排序字段 */
+    @ApiModelProperty(value = "排序字段：学员口碑:starts 信用等级:credibility_score 距离:distance")
+    private String orderName;
+
+    /** 排序名称 */
+    @ApiModelProperty(value = "排序名称:降序desc 升序asc")
+    private String orderType;
+
+
+}

hzgzpt-service-app/src/main/java/com/miaxis/app/coach/dto/CoachInfoVO.java

@@ -0,0 +1,102 @@
+package com.miaxis.app.coach.dto;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.miaxis.common.annotation.Excel;
+import com.miaxis.common.core.domain.BaseBusinessEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+/**
+ * 教练对象 coach_info
+ *
+ * @author miaxis
+ * @date 2021-01-07
+ */
+@Data
+@ApiModel(value = "CoachInfoVO", description = "教练对象 coach_info")
+public class CoachInfoVO extends BaseBusinessEntity {
+    private static final long serialVersionUID = 1L;
+
+    /** 教练员全国统一编号 */
+    @ApiModelProperty(value = "教练员全国统一编号")
+    private String coachnum;
+
+    /** 教练员性名 */
+    @ApiModelProperty(value = "教练员性名")
+    private String name;
+
+    /** 性别 ：1男  2女 */
+    @ApiModelProperty(value = "性别 ：1男  2女")
+    private Long sex;
+
+    /** 驾校全国统一编号 */
+    @ApiModelProperty(value = "驾校全国统一编号")
+    private String inscode;
+
+    /** 身份证明号码 */
+    @ApiModelProperty(value = "身份证明号码")
+    private String idcard;
+
+    /** 手机号码 */
+    @ApiModelProperty(value = "手机号码")
+    private String mobile;
+
+    /** 地址 */
+    @ApiModelProperty(value = "地址")
+    private String address;
+
+    /** 教练员头像ID */
+    @ApiModelProperty(value = "教练员头像ID")
+    private Long photo;
+
+    /** 准驾车型 */
+    @ApiModelProperty(value = "准驾车型")
+    private String dripermitted;
+
+    /** 准教车型 */
+    @ApiModelProperty(value = "准教车型")
+    private String teachpermitted;
+
+    /** 地区编号 */
+    @ApiModelProperty(value = "地区编号")
+    private String district;
+
+    /** 供职状态：0:在职 1离职*/
+    @ApiModelProperty(value = "供职状态：0:在职 1离职")
+    private Long employstatus;
+    /** 停训 1-停训 0-启用 */
+    @ApiModelProperty(value = "停训 1-停训 0-启用")
+    private Long stopTrain;
+
+    /** 微信号 */
+    @ApiModelProperty(value = "微信号")
+    private String wechar;
+
+    /** 微信openid */
+    @ApiModelProperty(value = "微信openid")
+    private String openid;
+
+    /** 点赞数 */
+    @ApiModelProperty(value = "点赞数")
+    private Long fabulous;
+
+    /** 星级 */
+    @ApiModelProperty(value = "总星级")
+    private String totelStars;
+
+    /** 距离 */
+    @ApiModelProperty(value = "距离")
+    private String distance;
+
+    /** 头像照片 */
+    @ApiModelProperty(value = "头像照片")
+    private String fileUrl;
+
+
+
+}

hzgzpt-service-app/src/main/java/com/miaxis/app/coach/mapper/CoachInfoMapper.java

@@ -3,6 +3,8 @@ package com.miaxis.app.coach.mapper;
 import java.util.List;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.miaxis.app.coach.domain.CoachInfo;
+import com.miaxis.app.coach.dto.CoachInfoDTO;
+import com.miaxis.app.coach.dto.CoachInfoVO;
 
 /**
  * 教练Mapper接口
@@ -58,4 +60,9 @@ public interface CoachInfoMapper extends BaseMapper<CoachInfo> {
      * @return 结果
      */
     public int deleteCoachInfoByIds(String[] coachnums);
+
+    /**
+     * 查询教练列表 带头像距离信息
+     */
+    public List<CoachInfoVO> selectCoachInfoUrlList(CoachInfoDTO coachInfoDTO);
 }

hzgzpt-service-app/src/main/java/com/miaxis/app/coach/service/ICoachInfoService.java

@@ -3,6 +3,8 @@ package com.miaxis.app.coach.service;
 import java.util.List;
 import com.miaxis.app.coach.domain.CoachInfo;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.miaxis.app.coach.dto.CoachInfoDTO;
+import com.miaxis.app.coach.dto.CoachInfoVO;
 
 /**
  * 教练Service接口
@@ -58,4 +60,11 @@ public interface ICoachInfoService extends IService<CoachInfo>{
      * @return 结果
      */
     public int deleteCoachInfoById(String coachnum);
+
+    /**
+     * 查询教练信息列表 带头像距离
+     * @param coachInfoDTO
+     * @return
+     */
+    public List<CoachInfoVO> selectCoachInfoUrlList(CoachInfoDTO coachInfoDTO);
 }

hzgzpt-service-app/src/main/java/com/miaxis/app/coach/service/impl/CoachEvaluateServiceImpl.java

@@ -64,9 +64,9 @@ public class CoachEvaluateServiceImpl extends ServiceImpl<CoachEvaluateMapper, C
             CoachEvaluate coachEvaluate = new CoachEvaluate();
             coachEvaluate.setUserId(Long.valueOf(coachEvaluateDto.getUserId()));
             coachEvaluate.setCoachnum(coachEvaluateDto.getCoachnum());
-            coachEvaluate.setAreaStarts(Long.valueOf(coachEvaluateDto.getAreaStarts()));
-            coachEvaluate.setAttitudeStarts(coachEvaluateDto.getAttitudeStarts());
-            coachEvaluate.setTotelStarts(coachEvaluateDto.getTotalStarts());
+            coachEvaluate.setAreaStars(Long.valueOf(coachEvaluateDto.getAreaStars()));
+            coachEvaluate.setAttitudeStarts(coachEvaluateDto.getAttitudeStars());
+            coachEvaluate.setTotelStars(coachEvaluateDto.getTotalStars());
             coachEvaluate.setContent(coachEvaluateDto.getContent());
             coachEvaluate.setLabelIds(coachEvaluateDto.getLabelIds());
             coachEvaluate.setStatus(0);

hzgzpt-service-app/src/main/java/com/miaxis/app/coach/service/impl/CoachInfoServiceImpl.java

@@ -2,6 +2,8 @@ package com.miaxis.app.coach.service.impl;
 
 import java.util.List;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.miaxis.app.coach.dto.CoachInfoDTO;
+import com.miaxis.app.coach.dto.CoachInfoVO;
 import com.miaxis.common.utils.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -87,4 +89,10 @@ public class CoachInfoServiceImpl extends ServiceImpl<CoachInfoMapper, CoachInfo
     public int deleteCoachInfoById(String coachnum){
         return coachInfoMapper.deleteCoachInfoById(coachnum);
     }
+
+
+    @Override
+    public List<CoachInfoVO> selectCoachInfoUrlList(CoachInfoDTO coachInfoDTO) {
+        return coachInfoMapper.selectCoachInfoUrlList(coachInfoDTO);
+    }
 }

hzgzpt-service-app/src/main/resources/mapper/coach/CoachEvaluateMapper.xml

@@ -20,7 +20,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectCoachEvaluateVo">
-        select id, user_id, coachnum, attitude_starts, area_stars, totel_stars, content, label_ids, create_time, is_anonymous, update_time, status from coach_evaluate
+        select id, user_id, coachnum, attitude_stars, area_stars, totel_stars, content, label_ids, create_time, is_anonymous, update_time, status from coach_evaluate
     </sql>
 
     

hzgzpt-service-app/src/main/resources/mapper/coach/CoachInfoMapper.xml

@@ -25,9 +25,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="fabulous"    column="fabulous"    />
     </resultMap>
 
-    <select id="selectCoachInfoUrlList" parameterType="CoachInfo" resultMap="CoachInfoResult">
-        SELECT c.*,ci.file_url,ce.totel_starts,
-        (2 * 6378.137 * ASIN(SQRT(POW( SIN( PI( ) * ( 120- s.poi_lon ) / 360 ), 2 ) + COS( PI( ) * 34 / 180 ) * COS( s.poi_lat * PI( ) / 180 ) * POW( SIN( PI( ) * ( 34- s.poi_lat ) / 360 ), 2 )) ) ) AS distance FROM coach_info c
+    <select id="selectCoachInfoUrlList" parameterType="com.miaxis.app.coach.dto.CoachInfoDTO" resultType="com.miaxis.app.coach.dto.CoachInfoVO">
+        SELECT c.*,ci.file_url,ce.totel_stars,
+        (2 * 6378.137 * ASIN(SQRT(POW( SIN( PI( ) * ( #{lon}- s.poi_lon ) / 360 ), 2 ) + COS( PI( ) * #{lat} / 180 ) * COS( s.poi_lat * PI( ) / 180 ) * POW( SIN( PI( ) * ( #{lat}- s.poi_lat ) / 360 ), 2 )) ) ) AS distance FROM coach_info c
         join school_info s
         on c.inscode = s.inscode
         LEFT JOIN  coach_images ci
@@ -37,8 +37,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>
             <if test="teachpermitted != null  and teachpermitted != ''"> and teachpermitted = #{teachpermitted}</if>
             <if test="sex != null  and sex != ''"> and sex = #{sex}</if>
-            <if test="starts != null  coachnum sex != ''"> and ce.totel_starts = #{starts}</if>
+            <if test="star != null  star != ''"> and ce.totel_stars = #{star}</if>
         </where>
+
+        <if test="orderName!=null and orderType!=null">
+            order by ${orderName} ${orderType}
+        </if>
     </select>