Merge branch 'master' of ssh://192.168.8.213:10022/miaxis/hzgzpt

hzgzpt-admin/src/main/java/com/miaxis/pc/controller/school/PcSchoolEvaluateController.java

@@ -54,18 +54,6 @@ public class PcSchoolEvaluateController extends BaseController{
         return toResponsePageInfo(list);
     }
 
-    /**
-     * 导出驾校评价列表
-     */
-    @PreAuthorize("@ss.hasPermi('school:evaluate:export')")
-    @Log(title = "驾校评价", businessType = BusinessTypeEnum.EXPORT)
-    @GetMapping("/export")
-    @ApiOperation("导出驾校评价列表Excel")
-    public Response<String> export(@ModelAttribute SchoolEvaluate schoolEvaluate){
-        List<SchoolEvaluate> list = schoolEvaluateService.queryList(schoolEvaluate);
-        ExcelUtil<SchoolEvaluate> util = new ExcelUtil<SchoolEvaluate>(SchoolEvaluate.class);
-        return util.exportExcel(list, "evaluate");
-    }
 
     /**
      * 获取驾校评价详细信息

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

@@ -63,9 +63,9 @@ public class CoachEvaluate extends BaseBusinessEntity {
 
     /** 总体星级1-5 */
     @Excel(name = "总体星级1-5")
-    @TableField("totel_stars")
+    @TableField("total_stars")
     @ApiModelProperty(value = "总体星级1-5")
-    private Long totelStars;
+    private Long totalStars;
 
     /** 是否匿名：0 :公开  1匿名 */
     @Excel(name = "是否匿名：0 :公开  1匿名")

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

@@ -19,7 +19,7 @@ public class CoachEvaluatePcDTO extends BaseBusinessEntity {
     private String schoolName;
 
     @ApiModelProperty(value = "总体星级1-5")
-    private Long totelStars;
+    private Long totalStars;
 
     @ApiModelProperty(value = "是否匿名：0 :公开  1匿名")
     private Integer isAnonymous;

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

@@ -71,7 +71,7 @@ public class CoachEvaluateServiceImpl extends ServiceImpl<CoachEvaluateMapper, C
             coachEvaluate.setUserId(Long.valueOf(coachEvaluateDto.getUserId()));
             coachEvaluate.setCoachnum(coachEvaluateDto.getCoachnum());
             coachEvaluate.setAreaStars(Long.valueOf(coachEvaluateDto.getAreaStars()));
-            coachEvaluate.setTotelStars(coachEvaluateDto.getTotalStars());
+            coachEvaluate.setTotalStars(coachEvaluateDto.getTotalStars());
             coachEvaluate.setContent(coachEvaluateDto.getContent());
             coachEvaluate.setLabelIds(coachEvaluateDto.getLabelIds());
             coachEvaluate.setStatus("0");
@@ -103,7 +103,7 @@ public class CoachEvaluateServiceImpl extends ServiceImpl<CoachEvaluateMapper, C
      * pc 查询列表
      */
     @Override
-    @DataScope(deptAlias ="s")
+    @DataScope(deptAlias ="ci")
     public List<CoachEvaluatePcVO> queryList(CoachEvaluatePcDTO coachEvaluate) {
         return coachEvaluateMapper.queryList(coachEvaluate);
     }

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

@@ -96,7 +96,7 @@ public class CoachInfoServiceImpl extends ServiceImpl<CoachInfoMapper, CoachInfo
      * pc查询教练列表
      */
     @Override
-    @DataScope(deptAlias ="d")
+    @DataScope(deptAlias ="ci")
     public List<CoachInfoPcVO> queryList(CoachInfoPcDTO coachInfo) {
         return coachInfoMapper.queryList(coachInfo);
     }

hzgzpt-service/src/main/java/com/miaxis/coach/vo/CoachEvaluatePcVO.java

@@ -17,12 +17,17 @@ import java.util.Date;
 @Data
 @ApiModel(value = "CoachEvaluate", description = "pc教练评价对象")
 public class CoachEvaluatePcVO {
-    private static final long serialVersionUID = 1L;
 
     /** id */
     @ApiModelProperty(value = "id")
     private Long id;
 
+    @ApiModelProperty(value = "教练编号")
+    private String coachnum;
+
+    @ApiModelProperty(value = "教练姓名")
+    private String coachName;
+
     /** 用户id */
     @ApiModelProperty(value = "用户id")
     private Long userId;
@@ -39,7 +44,7 @@ public class CoachEvaluatePcVO {
     private String content;
 
     @ApiModelProperty(value = "总体星级1-5")
-    private Long totelStars;
+    private Long totalStars;
 
     @ApiModelProperty(value = "是否匿名：0 :公开  1匿名")
     private Integer isAnonymous;

hzgzpt-service/src/main/java/com/miaxis/school/domain/SchoolEvaluate.java

@@ -39,15 +39,15 @@ public class SchoolEvaluate extends BaseBusinessEntity {
 
     /** 态度星级 */
     @Excel(name = "态度星级")
-    @TableField("attitude_starts")
+    @TableField("attitude_stars")
     @ApiModelProperty(value = "态度星级")
-    private Long attitudeStarts;
+    private Long attitudeStars;
 
     /** 场级星级 */
     @Excel(name = "场级星级")
-    @TableField("area_starts")
+    @TableField("area_stars")
     @ApiModelProperty(value = "场级星级")
-    private Long areaStarts;
+    private Long areaStars;
 
     /** 评价用户ID */
     @Excel(name = "评价用户ID")
@@ -57,9 +57,9 @@ public class SchoolEvaluate extends BaseBusinessEntity {
 
     /** 总体星数：星星数1-5星 */
     @Excel(name = "总体星数：星星数1-5星")
-    @TableField("total_starts")
+    @TableField("total_stars")
     @ApiModelProperty(value = "总体星数：星星数1-5星")
-    private Long totalStarts;
+    private Long totalStars;
 
     /** 是否匿名：0 :公开  1匿名 */
     @Excel(name = "是否匿名：0 :公开  1匿名")

hzgzpt-service/src/main/java/com/miaxis/school/dto/SchoolEvaluateDto.java

@@ -23,13 +23,13 @@ public class SchoolEvaluateDto extends BaseBusinessEntity {
     private String inscode;
 
     @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/src/main/java/com/miaxis/school/mapper/SchoolEvaluateMapper.java

@@ -4,6 +4,8 @@ package com.miaxis.school.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.miaxis.school.domain.SchoolEvaluate;
 
+import java.util.List;
+
 /**
  * 驾校评价Mapper接口
  *
@@ -13,4 +15,11 @@ import com.miaxis.school.domain.SchoolEvaluate;
 public interface SchoolEvaluateMapper extends BaseMapper<SchoolEvaluate> {
 
 
+    /**
+     * pc列表查询
+     * @param schoolEvaluate
+     * @return
+     */
+    List<SchoolEvaluate> queryList(SchoolEvaluate schoolEvaluate);
+
 }

hzgzpt-service/src/main/java/com/miaxis/school/service/impl/SchoolClassTypeServiceImpl.java

@@ -34,7 +34,7 @@ public class SchoolClassTypeServiceImpl extends ServiceImpl<SchoolClassTypeMappe
      * pc班型查询列表
      */
     @Override
-    @DataScope(deptAlias ="s")
+    @DataScope(deptAlias ="sc")
     public List<SchoolClassTypePcVO> queryList(SchoolClassTypePcDTO schoolClassTypePcDTO) {
         return schoolClassTypeMapper.queryList(schoolClassTypePcDTO);
     }

hzgzpt-service/src/main/java/com/miaxis/school/service/impl/SchoolEvaluateServiceImpl.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.miaxis.common.annotation.DataScope;
 import com.miaxis.school.domain.SchoolEvaluate;
 import com.miaxis.school.domain.SchoolEvaluateImages;
 import com.miaxis.school.domain.SchoolEvaluateLabel;
@@ -68,9 +69,9 @@ public class SchoolEvaluateServiceImpl extends ServiceImpl<SchoolEvaluateMapper,
             SchoolEvaluate schoolEvaluate = new SchoolEvaluate();
             schoolEvaluate.setUserId(Long.valueOf(schoolEvaluateDto.getUserId()));
             schoolEvaluate.setInscode(schoolEvaluateDto.getInscode());
-            schoolEvaluate.setAreaStarts(Long.valueOf(schoolEvaluateDto.getAreaStarts()));
-            schoolEvaluate.setAttitudeStarts(schoolEvaluateDto.getAttitudeStarts());
-            schoolEvaluate.setTotalStarts(schoolEvaluateDto.getTotalStarts());
+            schoolEvaluate.setAreaStars(Long.valueOf(schoolEvaluateDto.getAreaStars()));
+            schoolEvaluate.setAttitudeStars(schoolEvaluateDto.getAttitudeStars());
+            schoolEvaluate.setTotalStars(schoolEvaluateDto.getTotalStars());
             schoolEvaluate.setContent(schoolEvaluateDto.getContent());
             schoolEvaluate.setSchoolLabelIds(schoolEvaluateDto.getSchoolLabelIds());
             schoolEvaluate.setIsAnonymous(Long.valueOf(schoolEvaluateDto.getIsAnonymous()));
@@ -100,36 +101,9 @@ public class SchoolEvaluateServiceImpl extends ServiceImpl<SchoolEvaluateMapper,
      * pc 查询列表
      */
     @Override
+    @DataScope(deptAlias ="se")
     public List<SchoolEvaluate> queryList(SchoolEvaluate schoolEvaluate) {
-        LambdaQueryWrapper<SchoolEvaluate> lqw = Wrappers.lambdaQuery();
-        if (StringUtils.isNotBlank(schoolEvaluate.getInscode())){
-            lqw.eq(SchoolEvaluate::getInscode ,schoolEvaluate.getInscode());
-        }
-        if (StringUtils.isNotBlank(schoolEvaluate.getContent())){
-            lqw.eq(SchoolEvaluate::getContent ,schoolEvaluate.getContent());
-        }
-        if (schoolEvaluate.getAttitudeStarts() != null){
-            lqw.eq(SchoolEvaluate::getAttitudeStarts ,schoolEvaluate.getAttitudeStarts());
-        }
-        if (schoolEvaluate.getAreaStarts() != null){
-            lqw.eq(SchoolEvaluate::getAreaStarts ,schoolEvaluate.getAreaStarts());
-        }
-        if (schoolEvaluate.getUserId() != null){
-            lqw.eq(SchoolEvaluate::getUserId ,schoolEvaluate.getUserId());
-        }
-        if (schoolEvaluate.getTotalStarts() != null){
-            lqw.eq(SchoolEvaluate::getTotalStarts ,schoolEvaluate.getTotalStarts());
-        }
-        if (schoolEvaluate.getIsAnonymous() != null){
-            lqw.eq(SchoolEvaluate::getIsAnonymous ,schoolEvaluate.getIsAnonymous());
-        }
-        if (StringUtils.isNotBlank(schoolEvaluate.getSchoolLabelIds())){
-            lqw.eq(SchoolEvaluate::getSchoolLabelIds ,schoolEvaluate.getSchoolLabelIds());
-        }
-        if (schoolEvaluate.getStatus() != null){
-            lqw.eq(SchoolEvaluate::getStatus ,schoolEvaluate.getStatus());
-        }
-        return this.list(lqw);
+        return schoolEvaluateMapper.queryList(schoolEvaluate);
     }
 
 }

hzgzpt-service/src/main/java/com/miaxis/school/service/impl/SchoolRegionServiceImpl.java

@@ -87,7 +87,7 @@ public class SchoolRegionServiceImpl extends ServiceImpl<SchoolRegionMapper, Sch
      * @return
      */
     @Override
-    @DataScope(deptAlias ="s")
+    @DataScope(deptAlias ="sr")
     public List<SchoolRegionPcVO> queryRegionList(SchoolRegion schoolRegion) {
         return schoolRegionMapper.queryRegionList(schoolRegion);
     }

hzgzpt-service/src/main/java/com/miaxis/school/vo/SchoolEvaluatePcVO.java

@@ -0,0 +1,55 @@
+package com.miaxis.school.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * pc驾校评价对象
+ *
+ * @author wwl
+ * @date 2020-1-22
+ */
+@Data
+@ApiModel(value = "SchoolEvaluate", description = "pc驾校评价对象")
+public class SchoolEvaluatePcVO {
+
+    /** id */
+    @ApiModelProperty(value = "id")
+    private Long id;
+
+    /** 用户id */
+    @ApiModelProperty(value = "用户id")
+    private Long userId;
+
+    @ApiModelProperty(value = "驾校编号")
+    private String inscode;
+
+    /** 用户名 */
+    @ApiModelProperty(value = "用户名")
+    private String userName;
+
+    /** 用户手机号 */
+    @ApiModelProperty(value = "用户手机号")
+    private String userPhone;
+
+    @ApiModelProperty(value = "评价内容")
+    private String content;
+
+    @ApiModelProperty(value = "总体星级1-5")
+    private Long totelStars;
+
+    @ApiModelProperty(value = "是否匿名：0 :公开  1匿名")
+    private Integer isAnonymous;
+
+    @ApiModelProperty(value = "状态   0：启用 1：禁用")
+    private String status;
+
+    @ApiModelProperty(value = "创建时间"  ,hidden = true)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+
+}

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

@@ -10,7 +10,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="coachnum"    column="coachnum"    />
         <result property="attitudeStars"    column="attitude_stars"    />
         <result property="areaStars"    column="area_stars"    />
-        <result property="totelStars"    column="totel_stars"    />
+        <result property="totalStars"    column="total_stars"    />
         <result property="content"    column="content"    />
         <result property="labelIds"    column="label_ids"    />
         <result property="createTime"    column="create_time"    />
@@ -19,30 +19,32 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="status"    column="status"    />
     </resultMap>
 
-    <sql id="selectCoachEvaluateVo">
-        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>
-
     <select id="queryList" resultType="com.miaxis.coach.vo.CoachEvaluatePcVO">
         SELECT
         ce.`id`,
         ce.`user_id` as userId,
         ce.`coachnum`,
-        ce.`totel_stars` as totelStars,
+        ce.`total_stars` as totalStars,
         ce.`content`,
         ce.`is_anonymous` as isAnonymous,
         ce.`create_time`,
-        u.`name` as userName,
+        ci.`name` as coachName,
+        (CASE WHEN ce.`is_anonymous` = '1' THEN '匿名' WHEN ce.`is_anonymous` = '0' THEN u.`name` ELSE '未知' END ) AS userName,
         u.`phone` as userPhone
         FROM
         coach_evaluate ce
         join user_info u on u.id = ce.`user_id`
         join coach_info ci on ci.coachnum = ce.coachnum
-        join school_info s on s.inscode = ci.inscode
+        <where>
+            <!-- 数据范围过滤 -->
+            ${params.dataScope}
+        </where>
 
-        <!-- 数据范围过滤 -->
-        ${params.dataScope}
     </select>
 
+    <sql id="selectCoachEvaluateVo">
+        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>
+
 
 </mapper>

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

@@ -166,7 +166,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         ci.`mobile`
         FROM
         coach_info ci
-        join school_info d on ci.inscode= d.inscode
         <where>
             <if test="status == null"> and ci.`status` = '0'</if>
             <if test="status == '2'.toString()"> and exists(SELECT `status` FROM `coach_info`) </if>
@@ -174,9 +173,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="name != null  and name != ''"> and ci.`name` like concat('%', #{name}, '%')</if>
             <if test="coachnum != null  and coachnum != ''"> and ci.coachnum = #{coachnum}</if>
             <if test="mobile != null  and mobile != ''"> and ci.mobile = #{mobile}</if>
+            <!-- 数据范围过滤 -->
+            ${params.dataScope}
         </where>
-        <!-- 数据范围过滤 -->
-        ${params.dataScope}
+
     </select>
 
     <!--密码重置-->

hzgzpt-service/src/main/resources/mapper/school/SchoolClassTypeMapper.xml

@@ -40,7 +40,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         sc.`create_time` as createTime
         FROM
         school_class_type sc
-        JOIN school_info s ON s.inscode = sc.inscode
         <where>
             <if test="status == null"> and sc.`status` = '0'</if>
             <if test="status == '2'.toString()"> and exists(SELECT `status` FROM `coach_info`) </if>
@@ -50,9 +49,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="train != null  and train != ''"> and sc.train = #{train}</if>
             <if test="payType != null  and payType != ''"> and sc.pay_type = #{payType}</if>
             <if test="pxcx != null  and pxcx != ''"> and sc.pxcx = #{pxcx}</if>
+            <!-- 数据范围过滤 -->
+            ${params.dataScope}
         </where>
-        <!-- 数据范围过滤 -->
-        ${params.dataScope}
+
     </select>
 
     <!--删除驾校班型(逻辑删除)-->

hzgzpt-service/src/main/resources/mapper/school/SchoolEvaluateMapper.xml

@@ -8,17 +8,37 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="id"    column="id"    />
         <result property="inscode"    column="inscode"    />
         <result property="content"    column="content"    />
-        <result property="attitudeStarts"    column="attitude_starts"    />
-        <result property="areaStarts"    column="area_starts"    />
+        <result property="attitudeStars"    column="attitude_stars"    />
+        <result property="areaStars"    column="area_stars"    />
         <result property="userId"    column="user_id"    />
         <result property="createTime"    column="create_time"    />
-        <result property="totalStarts"    column="total_starts"    />
+        <result property="totalStars"    column="total_stars"    />
         <result property="updateTime"    column="update_time"    />
         <result property="isAnonymous"    column="is_anonymous"    />
         <result property="schoolLabelIds"    column="school_label_ids"    />
         <result property="status"    column="status"    />
     </resultMap>
 
+    <select id="queryList" resultType="com.miaxis.school.vo.SchoolEvaluatePcVO">
+        SELECT
+        se.`id`,
+        se.`user_id` as userId,
+        se.`inscode`,
+        se.`total_stars` as totelStars,
+        se.`content`,
+        se.`is_anonymous` as isAnonymous,
+        se.`create_time`,
+        (CASE WHEN se.`is_anonymous` = '1' THEN '匿名' WHEN se.`is_anonymous` = '0' THEN u.`name` ELSE '未知' END ) AS userName,
+        u.`phone` as userPhone
+        FROM
+        school_evaluate se
+        join user_info u on u.id = se.`user_id`
+        <where>
+            <!-- 数据范围过滤 -->
+            ${params.dataScope}
+        </where>
+
+    </select>
 
 
 </mapper>

hzgzpt-service/src/main/resources/mapper/school/SchoolRegionMapper.xml

@@ -44,16 +44,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         sr.`create_time` as createTime
         FROM
         school_region sr
-        join school_info s on s.inscode= sr.inscode
         <where>
             <if test="removed == null"> and sr.`removed` = '0'</if>
             <if test="removed == '2'.toString()"> and exists(SELECT `removed` FROM `school_info`) </if>
             <if test="removed != null and removed != '' and removed != '2'.toString()"> and sr.`removed` = #{removed}</if>
             <if test="name != null  and name != ''"> and sr.`name` like concat('%', #{name}, '%')</if>
+            <!-- 数据范围过滤 -->
+            ${params.dataScope}
         </where>
-
-        <!-- 数据范围过滤 -->
-        ${params.dataScope}
     </select>
 
     <!--pc删除场地(逻辑删除)-->