驾校删除修改，教练评价修改

hzgzpt-admin/src/main/java/com/miaxis/pc/controller/coach/PcCoachEvaluateController.java

@@ -1,7 +1,9 @@
 package com.miaxis.pc.controller.coach;
 
 import com.miaxis.coach.domain.CoachEvaluate;
+import com.miaxis.coach.dto.CoachEvaluatePcDTO;
 import com.miaxis.coach.service.ICoachEvaluateService;
+import com.miaxis.coach.vo.CoachEvaluatePcVO;
 import com.miaxis.common.annotation.Log;
 import com.miaxis.common.core.controller.BaseController;
 import com.miaxis.common.core.domain.Response;
@@ -40,24 +42,12 @@ public class PcCoachEvaluateController extends BaseController{
             @ApiImplicitParam(name = "pageNum",value = "当前页码" ,dataType = "int", paramType = "query", required = false),
             @ApiImplicitParam(name = "pageSize",value = "每页数据量" , dataType = "int", paramType = "query", required = false),
     })
-    public ResponsePageInfo<CoachEvaluate> list(@ModelAttribute CoachEvaluate coachEvaluate){
+    public ResponsePageInfo<CoachEvaluatePcVO> list(@ModelAttribute CoachEvaluatePcDTO coachEvaluate){
         startPage();
-        List<CoachEvaluate> list = coachEvaluateService.queryList(coachEvaluate);
+        List<CoachEvaluatePcVO> list = coachEvaluateService.queryList(coachEvaluate);
         return toResponsePageInfo(list);
     }
 
-    /**
-     * 导出教练评价列表
-     */
-    @PreAuthorize("@ss.hasPermi('coach:evaluate:export')")
-    @Log(title = "教练评价", businessType = BusinessTypeEnum.EXPORT)
-    @GetMapping("/export")
-    @ApiOperation("导出教练评价列表Excel")
-    public Response<String> export(@ModelAttribute CoachEvaluate coachEvaluate){
-        List<CoachEvaluate> list = coachEvaluateService.queryList(coachEvaluate);
-        ExcelUtil<CoachEvaluate> util = new ExcelUtil<CoachEvaluate>(CoachEvaluate.class);
-        return util.exportExcel(list, "evaluate");
-    }
 
     /**
      * 获取教练评价详细信息

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

@@ -89,12 +89,12 @@ public class PcSchoolInfoController extends BaseController{
      */
     @PreAuthorize("@ss.hasPermi('school:info:remove')")
     @Log(title = "驾校", businessType = BusinessTypeEnum.UPDATE)
-	@PostMapping("/{inscodes}")
+	@DeleteMapping("/{ids}")
     @ApiOperation("删除驾校(逻辑删除)")
     public  Response<Integer> updateByInscode(
-            @ApiParam(name = "inscodes", value = "驾校全国统一编号集合参数", required = true)
-            @PathVariable String[] inscodes
+            @ApiParam(name = "ids", value = "驾校全国统一编号集合参数", required = true)
+            @PathVariable Long[] ids
     ){
-        return toResponse(schoolInfoService.updateByInscode(inscodes) ? 1 : 0);
+        return toResponse(schoolInfoService.updateByInscode(ids) ? 1 : 0);
     }
 }

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

@@ -0,0 +1,30 @@
+package com.miaxis.coach.dto;
+
+import com.miaxis.common.core.domain.BaseBusinessEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * PC教练评价对象
+ *
+ * @author WWL
+ * @date 2020-1-21
+ */
+@Data
+@ApiModel(value = "CoachEvaluate", description = "PC教练评价对象DTO")
+public class CoachEvaluatePcDTO extends BaseBusinessEntity {
+
+    @ApiModelProperty(value = "驾校名称")
+    private String schoolName;
+
+    @ApiModelProperty(value = "总体星级1-5")
+    private Long totelStars;
+
+    @ApiModelProperty(value = "是否匿名：0 :公开  1匿名")
+    private Integer isAnonymous;
+
+    @ApiModelProperty(value = "状态   0：启用 1：禁用")
+    private Integer status;
+
+}

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

@@ -3,6 +3,10 @@ package com.miaxis.coach.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.miaxis.coach.domain.CoachEvaluate;
+import com.miaxis.coach.dto.CoachEvaluatePcDTO;
+import com.miaxis.coach.vo.CoachEvaluatePcVO;
+
+import java.util.List;
 
 /**
  * 教练评价Mapper接口
@@ -13,4 +17,10 @@ import com.miaxis.coach.domain.CoachEvaluate;
 public interface CoachEvaluateMapper extends BaseMapper<CoachEvaluate> {
 
 
+    /**
+     * pc 查询列表
+     * @param coachEvaluate
+     * @return
+     */
+    List<CoachEvaluatePcVO> queryList(CoachEvaluatePcDTO coachEvaluate);
 }

hzgzpt-service/src/main/java/com/miaxis/coach/service/ICoachEvaluateService.java

@@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.miaxis.coach.domain.CoachEvaluate;
 import com.miaxis.coach.domain.CoachEvaluateLabel;
 import com.miaxis.coach.dto.CoachEvaluateDto;
+import com.miaxis.coach.dto.CoachEvaluatePcDTO;
+import com.miaxis.coach.vo.CoachEvaluatePcVO;
 import com.miaxis.common.core.domain.Response;
 
 import java.util.List;
@@ -34,5 +36,5 @@ public interface  ICoachEvaluateService extends IService<CoachEvaluate> {
     /**
      * pc 查询列表
      */
-    List<CoachEvaluate> queryList(CoachEvaluate coachEvaluate);
+    List<CoachEvaluatePcVO> queryList(CoachEvaluatePcDTO coachEvaluate);
 }

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

@@ -9,10 +9,13 @@ import com.miaxis.coach.domain.CoachEvaluate;
 import com.miaxis.coach.domain.CoachEvaluateImages;
 import com.miaxis.coach.domain.CoachEvaluateLabel;
 import com.miaxis.coach.dto.CoachEvaluateDto;
+import com.miaxis.coach.dto.CoachEvaluatePcDTO;
 import com.miaxis.coach.mapper.CoachEvaluateLabelMapper;
 import com.miaxis.coach.mapper.CoachEvaluateMapper;
 import com.miaxis.coach.service.ICoachEvaluateImagesService;
 import com.miaxis.coach.service.ICoachEvaluateService;
+import com.miaxis.coach.vo.CoachEvaluatePcVO;
+import com.miaxis.common.annotation.DataScope;
 import com.miaxis.common.core.domain.Response;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
@@ -100,36 +103,9 @@ public class CoachEvaluateServiceImpl extends ServiceImpl<CoachEvaluateMapper, C
      * pc 查询列表
      */
     @Override
-    public List<CoachEvaluate> queryList(CoachEvaluate coachEvaluate) {
-        LambdaQueryWrapper<CoachEvaluate> lqw = Wrappers.lambdaQuery();
-        if (coachEvaluate.getUserId() != null){
-            lqw.eq(CoachEvaluate::getUserId ,coachEvaluate.getUserId());
-        }
-        if (StringUtils.isNotBlank(coachEvaluate.getCoachnum())){
-            lqw.eq(CoachEvaluate::getCoachnum ,coachEvaluate.getCoachnum());
-        }
-        if (coachEvaluate.getAttitudeStars() != null){
-            lqw.eq(CoachEvaluate::getAttitudeStars ,coachEvaluate.getAttitudeStars());
-        }
-        if (coachEvaluate.getAreaStars() != null){
-            lqw.eq(CoachEvaluate::getAreaStars ,coachEvaluate.getAreaStars());
-        }
-        if (StringUtils.isNotBlank(coachEvaluate.getContent())){
-            lqw.eq(CoachEvaluate::getContent ,coachEvaluate.getContent());
-        }
-        if (StringUtils.isNotBlank(coachEvaluate.getLabelIds())){
-            lqw.eq(CoachEvaluate::getLabelIds ,coachEvaluate.getLabelIds());
-        }
-        if (coachEvaluate.getTotelStars() != null){
-            lqw.eq(CoachEvaluate::getTotelStars ,coachEvaluate.getTotelStars());
-        }
-        if (coachEvaluate.getIsAnonymous() != null){
-            lqw.eq(CoachEvaluate::getIsAnonymous ,coachEvaluate.getIsAnonymous());
-        }
-        if (coachEvaluate.getStatus() != null){
-            lqw.eq(CoachEvaluate::getStatus ,coachEvaluate.getStatus());
-        }
-        return this.list(lqw);
+    @DataScope(deptAlias ="s")
+    public List<CoachEvaluatePcVO> queryList(CoachEvaluatePcDTO coachEvaluate) {
+        return coachEvaluateMapper.queryList(coachEvaluate);
     }
 
 

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

@@ -0,0 +1,54 @@
+package com.miaxis.coach.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.miaxis.common.core.domain.BaseBusinessEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * pc教练评价对象
+ *
+ * @author wwl
+ * @date 2020-1-21
+ */
+@Data
+@ApiModel(value = "CoachEvaluate", description = "pc教练评价对象")
+public class CoachEvaluatePcVO {
+    private static final long serialVersionUID = 1L;
+
+    /** id */
+    @ApiModelProperty(value = "id")
+    private Long id;
+
+    /** 用户id */
+    @ApiModelProperty(value = "用户id")
+    private Long userId;
+
+    /** 用户名 */
+    @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 Integer status;
+
+    @ApiModelProperty(value = "创建时间"  ,hidden = true)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+
+}

hzgzpt-service/src/main/java/com/miaxis/school/mapper/SchoolInfoMapper.java

@@ -101,7 +101,7 @@ public interface SchoolInfoMapper extends BaseMapper<SchoolInfo> {
 
     /**
      * pc删除驾校(逻辑删除)
-     * @param inscodes
+     * @param ids
      */
-    void updateByInscode(@Param("inscodes")String[] inscodes);
+    void updateByInscode(@Param("ids")Long[] ids);
 }

hzgzpt-service/src/main/java/com/miaxis/school/service/ISchoolInfoService.java

@@ -100,8 +100,8 @@ public interface ISchoolInfoService extends IService<SchoolInfo>{
 
     /**
      * pc删除驾校(逻辑删除)
-     * @param inscodes
+     * @param ids
      * @return
      */
-    boolean updateByInscode(String[] inscodes);
+    boolean updateByInscode(Long[] ids);
 }

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

@@ -149,9 +149,9 @@ public class SchoolInfoServiceImpl extends ServiceImpl<SchoolInfoMapper, SchoolI
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public boolean updateByInscode(String[] inscodes) {
+    public boolean updateByInscode(Long[] ids) {
         try {
-            schoolInfoMapper.updateByInscode(inscodes);
+            schoolInfoMapper.updateByInscode(ids);
             return true;
         }catch (Exception e){
             throw new RuntimeException(e);

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

@@ -23,5 +23,26 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         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.`content`,
+        ce.`is_anonymous` as isAnonymous,
+        ce.`create_time`,
+        u.`name` 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
+
+        <!-- 数据范围过滤 -->
+        ${params.dataScope}
+    </select>
+
 
 </mapper>

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

@@ -302,9 +302,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         school_info s
         SET s.removed = '1'
         <where>
-            and s.inscode in
-            <foreach collection="inscodes" item="inscode" open="(" close=")" separator=",">
-                (#{inscode})
+            and s.id in
+            <foreach collection="ids" item="id" open="(" close=")" separator=",">
+                (#{id})
             </foreach>
         </where>
     </update>