pc-教练相关接口；

pc-教练评价相关接口；
pc-驾校相关接口；
pc-驾校评价相关接口；

hzgzpt-admin/src/main/java/com/miaxis/app/controller/school/SchoolEvaluateController.java

@@ -4,11 +4,9 @@ package com.miaxis.app.controller.school;
 import com.miaxis.app.school.domain.SchoolEvaluateLabel;
 import com.miaxis.app.school.dto.SchoolEvaluateDto;
 import com.miaxis.app.school.service.ISchoolEvaluateService;
-import com.miaxis.common.annotation.Log;
 import com.miaxis.common.constant.Constants;
 import com.miaxis.common.core.controller.BaseController;
 import com.miaxis.common.core.domain.Response;
-import com.miaxis.common.enums.BusinessTypeEnum;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;

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

@@ -0,0 +1,109 @@
+package com.miaxis.pc.controller.coach;
+
+import com.miaxis.app.coach.domain.CoachEvaluate;
+import com.miaxis.app.coach.service.ICoachEvaluateService;
+import com.miaxis.common.annotation.Log;
+import com.miaxis.common.core.controller.BaseController;
+import com.miaxis.common.core.domain.Response;
+import com.miaxis.common.core.page.ResponsePageInfo;
+import com.miaxis.common.enums.BusinessTypeEnum;
+import com.miaxis.common.utils.poi.ExcelUtil;
+import io.swagger.annotations.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * 【教练评价】Controller
+ *
+ * @author wwl
+ * @date 2021-01-15
+ */
+@RestController
+@RequestMapping("/open-api/coach/evaluate")
+@Api(tags={"【pc-教练评价】"})
+public class PcCoachEvaluateController extends BaseController{
+
+    @Autowired
+    private ICoachEvaluateService coachEvaluateService;
+
+    /**
+     * 查询教练评价列表
+     */
+    //@PreAuthorize("@ss.hasPermi('system:evaluate: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<CoachEvaluate> list(@ModelAttribute CoachEvaluate coachEvaluate){
+        startPage();
+        List<CoachEvaluate> list = coachEvaluateService.queryList(coachEvaluate);
+        return toResponsePageInfo(list);
+    }
+
+    /**
+     * 导出教练评价列表
+     */
+   // @PreAuthorize("@ss.hasPermi('system: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");
+    }
+
+    /**
+     * 获取教练评价详细信息
+     */
+    //@PreAuthorize("@ss.hasPermi('system:evaluate:query')")
+    @GetMapping(value = "/{id}")
+    @ApiOperation("获取教练评价详细信息")
+    public Response<CoachEvaluate> getInfo(
+            @ApiParam(name = "id", value = "教练评价参数", required = true)
+            @PathVariable("id") Long id
+    ){
+        return Response.success(coachEvaluateService.getById(id));
+    }
+
+    /**
+     * 新增教练评价
+     */
+    //@PreAuthorize("@ss.hasPermi('system:evaluate:add')")
+    @Log(title = "教练评价", businessType = BusinessTypeEnum.INSERT)
+    @PostMapping
+    @ApiOperation("新增教练评价")
+    public Response<Integer> add(@RequestBody CoachEvaluate coachEvaluate){
+        return toResponse(coachEvaluateService.save(coachEvaluate) ? 1 : 0);
+    }
+
+    /**
+     * 修改教练评价
+     */
+    //@PreAuthorize("@ss.hasPermi('system:evaluate:edit')")
+    @Log(title = "教练评价", businessType = BusinessTypeEnum.UPDATE)
+    @PutMapping
+    @ApiOperation("修改教练评价")
+    public Response<Integer> edit(@RequestBody CoachEvaluate coachEvaluate){
+        return toResponse(coachEvaluateService.updateById(coachEvaluate) ? 1 : 0);
+    }
+
+    /**
+     * 删除教练评价
+     */
+    //@PreAuthorize("@ss.hasPermi('system:evaluate: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(coachEvaluateService.removeByIds(Arrays.asList(ids)) ? 1 : 0);
+    }
+}

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

@@ -0,0 +1,118 @@
+package com.miaxis.pc.controller.coach;
+
+import java.util.List;
+import java.util.Arrays;
+
+
+import com.miaxis.app.coach.domain.CoachInfo;
+import com.miaxis.app.coach.service.ICoachInfoService;
+import com.miaxis.common.core.page.ResponsePageInfo;
+import com.miaxis.common.utils.poi.ExcelUtil;
+import io.swagger.annotations.*;
+import com.miaxis.common.core.domain.Response;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import com.miaxis.common.annotation.Log;
+import com.miaxis.common.core.controller.BaseController;
+import com.miaxis.common.enums.BusinessTypeEnum;
+
+/**
+ * 【教练】Controller
+ *
+ * @author wwl
+ * @date 2021-01-15
+ */
+@RestController
+@RequestMapping("/open-api/coach")
+@Api(tags={"【pc-教练】"})
+public class PcCoachInfoController extends BaseController{
+
+    @Autowired
+    private ICoachInfoService coachInfoService;
+
+    /**
+     * 查询教练列表
+     */
+    //@PreAuthorize("@ss.hasPermi('open-api/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.queryList(coachInfo);
+        return toResponsePageInfo(list);
+    }
+
+    /**
+     * 导出教练列表
+     */
+   // @PreAuthorize("@ss.hasPermi('open-api/coach:info:export')")
+    @Log(title = "教练", businessType = BusinessTypeEnum.EXPORT)
+    @GetMapping("/export")
+    @ApiOperation("导出教练列表Excel")
+    public Response<String> export(@ModelAttribute CoachInfo coachInfo){
+        List<CoachInfo> list = coachInfoService.queryList(coachInfo);
+        ExcelUtil<CoachInfo> util = new ExcelUtil<CoachInfo>(CoachInfo.class);
+        return util.exportExcel(list, "info");
+    }
+
+    /**
+     * 获取教练详细信息
+     */
+    //@PreAuthorize("@ss.hasPermi('open-api/coach:info:query')")
+    @GetMapping(value = "/{coachnum}")
+    @ApiOperation("获取教练详细信息")
+    public Response<CoachInfo> getInfo(
+            @ApiParam(name = "coachnum", value = "教练参数", required = true)
+            @PathVariable("coachnum") String coachnum
+    ){
+        return Response.success(coachInfoService.getById(coachnum));
+    }
+
+    /**
+     * 新增教练
+     */
+    //@PreAuthorize("@ss.hasPermi('open-api/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('open-api/coach:info:edit')")
+    @Log(title = "教练", businessType = BusinessTypeEnum.UPDATE)
+    @PutMapping
+    @ApiOperation("修改教练")
+    public Response<Integer> edit(@RequestBody CoachInfo coachInfo){
+        return toResponse(coachInfoService.updateById(coachInfo) ? 1 : 0);
+    }
+
+    /**
+     * 删除教练
+     */
+    //@PreAuthorize("@ss.hasPermi('open-api/coach:info:remove')")
+    @Log(title = "教练", businessType = BusinessTypeEnum.DELETE)
+	@DeleteMapping("/{coachnums}")
+    @ApiOperation("删除教练")
+    public  Response<Integer> remove(
+            @ApiParam(name = "coachnums", value = "教练ids参数", required = true)
+            @PathVariable String[] coachnums
+    ){
+        return toResponse(coachInfoService.removeByIds(Arrays.asList(coachnums)) ? 1 : 0);
+    }
+}

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

@@ -0,0 +1,110 @@
+package com.miaxis.pc.controller.school;
+
+import com.miaxis.app.school.domain.SchoolClassType;
+import com.miaxis.app.school.service.ISchoolClassTypeService;
+import com.miaxis.common.annotation.Log;
+import com.miaxis.common.core.controller.BaseController;
+import com.miaxis.common.core.domain.Response;
+import com.miaxis.common.core.page.ResponsePageInfo;
+import com.miaxis.common.enums.BusinessTypeEnum;
+import com.miaxis.common.utils.poi.ExcelUtil;
+import io.swagger.annotations.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Arrays;
+import java.util.List;
+
+
+/**
+ * 【pc驾校班型】Controller
+ *
+ * @author wwl
+ * @date 2021-01-15
+ */
+@RestController
+@RequestMapping("/open-api/school/type")
+@Api(tags={"【pc-驾校班型】"})
+public class PcSchoolClassTypeController extends BaseController{
+
+    @Autowired
+    private ISchoolClassTypeService schoolClassTypeService;
+
+    /**
+     * 查询驾校班型列表
+     */
+//    @PreAuthorize("@ss.hasPermi('school:type: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<SchoolClassType> list(@ModelAttribute SchoolClassType schoolClassType){
+        startPage();
+        List<SchoolClassType> list = schoolClassTypeService.queryList(schoolClassType);
+        return toResponsePageInfo(list);
+    }
+
+    /**
+     * 导出驾校班型列表
+     */
+//    @PreAuthorize("@ss.hasPermi('school:type:export')")
+    @Log(title = "驾校班型", businessType = BusinessTypeEnum.EXPORT)
+    @GetMapping("/export")
+    @ApiOperation("导出驾校班型列表Excel")
+    public Response<String> export(@ModelAttribute SchoolClassType schoolClassType){
+        List<SchoolClassType> list = schoolClassTypeService.queryList(schoolClassType);
+        ExcelUtil<SchoolClassType> util = new ExcelUtil<>(SchoolClassType.class);
+        return util.exportExcel(list, "type");
+    }
+
+    /**
+     * 获取驾校班型详细信息
+     */
+//    @PreAuthorize("@ss.hasPermi('school:type:query')")
+    @GetMapping(value = "/{id}")
+    @ApiOperation("获取驾校班型详细信息")
+    public Response<SchoolClassType> getInfo(
+            @ApiParam(name = "id", value = "驾校班型参数", required = true)
+            @PathVariable("id") Long id
+    ){
+        return Response.success(schoolClassTypeService.getById(id));
+    }
+
+    /**
+     * 新增驾校班型
+     */
+//    @PreAuthorize("@ss.hasPermi('school:type:add')")
+    @Log(title = "驾校班型", businessType = BusinessTypeEnum.INSERT)
+    @PostMapping
+    @ApiOperation("新增驾校班型")
+    public Response<Integer> add(@RequestBody SchoolClassType schoolClassType){
+        return toResponse(schoolClassTypeService.save(schoolClassType) ? 1 : 0);
+    }
+
+    /**
+     * 修改驾校班型
+     */
+//    @PreAuthorize("@ss.hasPermi('school:type:edit')")
+    @Log(title = "驾校班型", businessType = BusinessTypeEnum.UPDATE)
+    @PutMapping
+    @ApiOperation("修改驾校班型")
+    public Response<Integer> edit(@RequestBody SchoolClassType schoolClassType){
+        return toResponse(schoolClassTypeService.updateById(schoolClassType) ? 1 : 0);
+    }
+
+    /**
+     * 删除驾校班型
+     */
+//    @PreAuthorize("@ss.hasPermi('school:type: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(schoolClassTypeService.removeByIds(Arrays.asList(ids)) ? 1 : 0);
+    }
+}

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

@@ -0,0 +1,118 @@
+package com.miaxis.pc.controller.school;
+
+import com.miaxis.app.school.domain.SchoolEvaluate;
+import com.miaxis.app.school.service.ISchoolEvaluateService;
+import com.miaxis.common.constant.Constants;
+import java.util.List;
+import java.util.Arrays;
+import io.swagger.annotations.*;
+import com.miaxis.common.core.domain.Response;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import com.miaxis.common.annotation.Log;
+import com.miaxis.common.core.controller.BaseController;
+import com.miaxis.common.enums.BusinessTypeEnum;
+import com.miaxis.common.utils.poi.ExcelUtil;
+import com.miaxis.common.core.page.ResponsePageInfo;
+
+/**
+ * 【驾校评价】Controller
+ *
+ * @author wwl
+ * @date 2021-01-15
+ */
+@RestController
+@RequestMapping("/open-api/system/evaluate")
+@Api(tags={"【pc-驾校评价】"})
+public class PcSchoolEvaluateController extends BaseController{
+
+    @Autowired
+    private ISchoolEvaluateService schoolEvaluateService;
+
+    /**
+     * 查询驾校评价列表
+     */
+    //@PreAuthorize("@ss.hasPermi('system:evaluate: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<SchoolEvaluate> list(@ModelAttribute SchoolEvaluate schoolEvaluate){
+        startPage();
+        List<SchoolEvaluate> list = schoolEvaluateService.queryList(schoolEvaluate);
+        return toResponsePageInfo(list);
+    }
+
+    /**
+     * 导出驾校评价列表
+     */
+   // @PreAuthorize("@ss.hasPermi('system: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");
+    }
+
+    /**
+     * 获取驾校评价详细信息
+     */
+    //@PreAuthorize("@ss.hasPermi('system:evaluate:query')")
+    @GetMapping(value = "/{id}")
+    @ApiOperation("获取驾校评价详细信息")
+    public Response<SchoolEvaluate> getInfo(
+            @ApiParam(name = "id", value = "驾校评价参数", required = true)
+            @PathVariable("id") Long id
+    ){
+        return Response.success(schoolEvaluateService.getById(id));
+    }
+
+    /**
+     * 新增驾校评价
+     */
+    //@PreAuthorize("@ss.hasPermi('system:evaluate:add')")
+    @Log(title = "驾校评价", businessType = BusinessTypeEnum.INSERT)
+    @PostMapping
+    @ApiOperation("新增驾校评价")
+    public Response<Integer> add(@RequestBody SchoolEvaluate schoolEvaluate){
+        return toResponse(schoolEvaluateService.save(schoolEvaluate) ? 1 : 0);
+    }
+
+    /**
+     * 修改驾校评价
+     */
+    //@PreAuthorize("@ss.hasPermi('system:evaluate:edit')")
+    @Log(title = "驾校评价", businessType = BusinessTypeEnum.UPDATE)
+    @PutMapping
+    @ApiOperation("修改驾校评价")
+    public Response<Integer> edit(@RequestBody SchoolEvaluate schoolEvaluate){
+        return toResponse(schoolEvaluateService.updateById(schoolEvaluate) ? 1 : 0);
+    }
+
+    /**
+     * 删除驾校评价
+     */
+    //@PreAuthorize("@ss.hasPermi('system:evaluate: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(schoolEvaluateService.removeByIds(Arrays.asList(ids)) ? 1 : 0);
+    }
+}

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

@@ -25,36 +25,30 @@ public class CoachEvaluate extends BaseBusinessEntity {
     @ApiModelProperty(value = "id")
     private Long id;
 
-    /** 评价用户ID */
-    @Excel(name = "评价用户ID")
+    /** 用户id */
+    @Excel(name = "用户id")
     @TableField("user_id")
-    @ApiModelProperty(value = "评价用户ID")
+    @ApiModelProperty(value = "用户id")
     private Long userId;
 
-    /** 服务态度 */
-    @Excel(name = "服务态度")
-    @TableField("attitude_starts")
-    @ApiModelProperty(value = "服务态度")
-    private Long attitudeStarts;
-
     /** 教练员全国统一编号 */
     @Excel(name = "教练员全国统一编号")
     @TableField("coachnum")
     @ApiModelProperty(value = "教练员全国统一编号")
     private String coachnum;
 
+    /** 服务态度 */
+    @Excel(name = "服务态度")
+    @TableField("attitude_stars")
+    @ApiModelProperty(value = "服务态度")
+    private Long attitudeStars;
+
     /** 场地星级 */
     @Excel(name = "场地星级")
     @TableField("area_stars")
     @ApiModelProperty(value = "场地星级")
     private Long areaStars;
 
-    /** 总体星级1-5 */
-    @Excel(name = "总体星级1-5")
-    @TableField("totel_starts")
-    @ApiModelProperty(value = "总体星级1-5")
-    private Long totelStars;
-
     /** 评价内容 */
     @Excel(name = "评价内容")
     @TableField("content")
@@ -67,6 +61,12 @@ public class CoachEvaluate extends BaseBusinessEntity {
     @ApiModelProperty(value = "标签表ID串")
     private String labelIds;
 
+    /** 总体星级1-5 */
+    @Excel(name = "总体星级1-5")
+    @TableField("totel_stars")
+    @ApiModelProperty(value = "总体星级1-5")
+    private Long totelStars;
+
     /** 是否匿名：0 :公开  1匿名 */
     @Excel(name = "是否匿名：0 :公开  1匿名")
     @TableField("is_anonymous")

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

@@ -12,7 +12,7 @@ import java.util.List;
 /**
  * 教练评价Service接口
  * 
- * @author miaxis
+ * @author wwl
  * @date 2020-12-28
  */
 public interface  ICoachEvaluateService extends IService<CoachEvaluate> {
@@ -30,4 +30,9 @@ public interface  ICoachEvaluateService extends IService<CoachEvaluate> {
      * @return
      */
     Response addCoachEvaluate(CoachEvaluateDto coachEvaluateDto);
+
+    /**
+     * pc 查询列表
+     */
+    List<CoachEvaluate> queryList(CoachEvaluate coachEvaluate);
 }

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

@@ -9,7 +9,7 @@ import com.miaxis.app.coach.dto.CoachInfoVO;
 /**
  * 教练Service接口
  * 
- * @author miaxis
+ * @author wwl
  * @date 2021-01-07
  */
 public interface ICoachInfoService extends IService<CoachInfo>{
@@ -67,4 +67,10 @@ public interface ICoachInfoService extends IService<CoachInfo>{
      * @return
      */
     public List<CoachInfoVO> selectCoachInfoUrlList(CoachInfoDTO coachInfoDTO);
+
+    /**
+     * pc 查询列表
+     */
+    List<CoachInfo> queryList(CoachInfo coachInfo);
+
 }

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

@@ -1,7 +1,9 @@
 package com.miaxis.app.coach.service.impl;
 
 import com.alibaba.fastjson.JSONArray;
+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.app.coach.domain.CoachEvaluate;
 import com.miaxis.app.coach.domain.CoachEvaluateImages;
@@ -12,6 +14,7 @@ import com.miaxis.app.coach.mapper.CoachEvaluateMapper;
 import com.miaxis.app.coach.service.ICoachEvaluateImagesService;
 import com.miaxis.app.coach.service.ICoachEvaluateService;
 import com.miaxis.common.core.domain.Response;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -24,7 +27,7 @@ import java.util.Map;
 /**
  * 教练评价Service业务层处理
  *
- * @author miaxis
+ * @author wwl
  * @date 2020-12-28
  */
 @Service
@@ -65,7 +68,6 @@ public class CoachEvaluateServiceImpl extends ServiceImpl<CoachEvaluateMapper, C
             coachEvaluate.setUserId(Long.valueOf(coachEvaluateDto.getUserId()));
             coachEvaluate.setCoachnum(coachEvaluateDto.getCoachnum());
             coachEvaluate.setAreaStars(Long.valueOf(coachEvaluateDto.getAreaStars()));
-            coachEvaluate.setAttitudeStarts(coachEvaluateDto.getAttitudeStars());
             coachEvaluate.setTotelStars(coachEvaluateDto.getTotalStars());
             coachEvaluate.setContent(coachEvaluateDto.getContent());
             coachEvaluate.setLabelIds(coachEvaluateDto.getLabelIds());
@@ -94,4 +96,41 @@ 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);
+    }
+
+
 }

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

@@ -1,10 +1,14 @@
 package com.miaxis.app.coach.service.impl;
 
 import java.util.List;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 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.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.miaxis.app.coach.mapper.CoachInfoMapper;
@@ -14,7 +18,7 @@ import com.miaxis.app.coach.service.ICoachInfoService;
 /**
  * 教练Service业务层处理
  *
- * @author miaxis
+ * @author wwl
  * @date 2021-01-07
  */
 @Service
@@ -95,4 +99,59 @@ public class CoachInfoServiceImpl extends ServiceImpl<CoachInfoMapper, CoachInfo
     public List<CoachInfoVO> selectCoachInfoUrlList(CoachInfoDTO coachInfoDTO) {
         return coachInfoMapper.selectCoachInfoUrlList(coachInfoDTO);
     }
+
+    /**
+     * pc 查询列表
+     */
+    @Override
+    public List<CoachInfo> queryList(CoachInfo coachInfo) {
+        LambdaQueryWrapper<CoachInfo> lqw = Wrappers.lambdaQuery();
+        if (StringUtils.isNotBlank(coachInfo.getName())){
+            lqw.like(CoachInfo::getName ,coachInfo.getName());
+        }
+        if (coachInfo.getSex() != null){
+            lqw.eq(CoachInfo::getSex ,coachInfo.getSex());
+        }
+        if (StringUtils.isNotBlank(coachInfo.getInscode())){
+            lqw.eq(CoachInfo::getInscode ,coachInfo.getInscode());
+        }
+        if (StringUtils.isNotBlank(coachInfo.getIdcard())){
+            lqw.eq(CoachInfo::getIdcard ,coachInfo.getIdcard());
+        }
+        if (StringUtils.isNotBlank(coachInfo.getMobile())){
+            lqw.eq(CoachInfo::getMobile ,coachInfo.getMobile());
+        }
+        if (StringUtils.isNotBlank(coachInfo.getAddress())){
+            lqw.eq(CoachInfo::getAddress ,coachInfo.getAddress());
+        }
+        if (coachInfo.getPhoto() != null){
+            lqw.eq(CoachInfo::getPhoto ,coachInfo.getPhoto());
+        }
+        if (StringUtils.isNotBlank(coachInfo.getDripermitted())){
+            lqw.eq(CoachInfo::getDripermitted ,coachInfo.getDripermitted());
+        }
+        if (StringUtils.isNotBlank(coachInfo.getTeachpermitted())){
+            lqw.eq(CoachInfo::getTeachpermitted ,coachInfo.getTeachpermitted());
+        }
+        if (StringUtils.isNotBlank(coachInfo.getDistrict())){
+            lqw.eq(CoachInfo::getDistrict ,coachInfo.getDistrict());
+        }
+        if (coachInfo.getEmploystatus() != null){
+            lqw.eq(CoachInfo::getEmploystatus ,coachInfo.getEmploystatus());
+        }
+        if (coachInfo.getStopTrain() != null){
+            lqw.eq(CoachInfo::getStopTrain ,coachInfo.getStopTrain());
+        }
+        if (StringUtils.isNotBlank(coachInfo.getWechar())){
+            lqw.eq(CoachInfo::getWechar ,coachInfo.getWechar());
+        }
+        if (StringUtils.isNotBlank(coachInfo.getOpenid())){
+            lqw.eq(CoachInfo::getOpenid ,coachInfo.getOpenid());
+        }
+        if (coachInfo.getFabulous() != null){
+            lqw.eq(CoachInfo::getFabulous ,coachInfo.getFabulous());
+        }
+        return this.list(lqw);
+    }
+
 }

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

@@ -0,0 +1,131 @@
+package com.miaxis.app.school.domain;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+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;
+
+import java.util.Date;
+/**
+ * 驾校班型对象 school_class_type
+ *
+ * @author miaxis
+ * @date 2021-01-15
+ */
+@Data
+@TableName("school_class_type")
+@ApiModel(value = "SchoolClassType", description = "驾校班型对象 school_class_type")
+public class SchoolClassType extends BaseBusinessEntity{
+    private static final long serialVersionUID = 1L;
+
+    /** $column.columnComment */
+    @TableId(value = "id")
+    @ApiModelProperty(value = "$column.columnComment")
+    private Long id;
+
+    /** 班级名称 */
+    @Excel(name = "班级名称")
+    @TableField("class_name")
+    @ApiModelProperty(value = "班级名称")
+    private String className;
+
+    /** 总价 */
+    @Excel(name = "总价")
+    @TableField("total_price")
+    @ApiModelProperty(value = "总价")
+    private Long totalPrice;
+
+    /** 学时 */
+    @Excel(name = "学时")
+    @TableField("train")
+    @ApiModelProperty(value = "学时")
+    private Long train;
+
+    /** 车型 */
+    @Excel(name = "车型")
+    @TableField("pxcx")
+    @ApiModelProperty(value = "车型")
+    private String pxcx;
+
+    /** 收费方式 1:一次性 2:先学后付 3:计时收费 */
+    @Excel(name = "收费方式 1:一次性 2:先学后付 3:计时收费")
+    @TableField("pay_type")
+    @ApiModelProperty(value = "收费方式 1:一次性 2:先学后付 3:计时收费")
+    private Long payType;
+
+    /** 每分钟多少钱 */
+    @Excel(name = "每分钟多少钱")
+    @TableField("min_price")
+    @ApiModelProperty(value = "每分钟多少钱")
+    private Long minPrice;
+
+    /** 科目一理论时间 */
+    @Excel(name = "科目一理论时间")
+    @TableField("one_time")
+    @ApiModelProperty(value = "科目一理论时间")
+    private Long oneTime;
+
+    /** 科目二实操时间 */
+    @Excel(name = "科目二实操时间")
+    @TableField("two_time")
+    @ApiModelProperty(value = "科目二实操时间")
+    private Long twoTime;
+
+    /** 科目三模拟时间 */
+    @Excel(name = "科目三模拟时间")
+    @TableField("three_simulation_time")
+    @ApiModelProperty(value = "科目三模拟时间")
+    private Long threeSimulationTime;
+
+    /** 科目三实操时间 */
+    @Excel(name = "科目三实操时间")
+    @TableField("three_practice_time")
+    @ApiModelProperty(value = "科目三实操时间")
+    private Long threePracticeTime;
+
+    /** 科目三理论时间 */
+    @Excel(name = "科目三理论时间")
+    @TableField("three_theory_time")
+    @ApiModelProperty(value = "科目三理论时间")
+    private Long threeTheoryTime;
+
+    /** 班型照片URL */
+    @Excel(name = "班型照片URL")
+    @TableField("photo_url")
+    @ApiModelProperty(value = "班型照片URL")
+    private String photoUrl;
+
+    /** 训练场ID */
+    @Excel(name = "训练场ID")
+    @TableField("region_id")
+    @ApiModelProperty(value = "训练场ID")
+    private Long regionId;
+
+    /** PDF合同url */
+    @Excel(name = "PDF合同url")
+    @TableField("pdf_url")
+    @ApiModelProperty(value = "PDF合同url")
+    private String pdfUrl;
+
+    /** 合同到期时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "合同到期时间", width = 30, dateFormat = "yyyy-MM-dd")
+    @TableField("contract_end_time")
+    @ApiModelProperty(value = "合同到期时间")
+    private Date contractEndTime;
+
+    /** 创建时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
+    @TableField("create_time")
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+
+}

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

@@ -41,12 +41,6 @@ public class SchoolEvaluate extends BaseBusinessEntity {
     @ApiModelProperty(value = "评价内容")
     private String content;
 
-    /** 评价用户ID */
-    @Excel(name = "评价用户ID")
-    @TableField("user_id")
-    @ApiModelProperty(value = "评价用户ID")
-    private Long userId;
-
     /** 态度星级 */
     @Excel(name = "态度星级")
     @TableField("attitude_starts")
@@ -59,6 +53,12 @@ public class SchoolEvaluate extends BaseBusinessEntity {
     @ApiModelProperty(value = "场级星级")
     private Long areaStarts;
 
+    /** 评价用户ID */
+    @Excel(name = "评价用户ID")
+    @TableField("user_id")
+    @ApiModelProperty(value = "评价用户ID")
+    private Long userId;
+
     /** 总体星数：星星数1-5星 */
     @Excel(name = "总体星数：星星数1-5星")
     @TableField("total_starts")
@@ -77,10 +77,10 @@ public class SchoolEvaluate extends BaseBusinessEntity {
     @ApiModelProperty(value = "驾校标签表ID串")
     private String schoolLabelIds;
 
-    /** 状态   0：启用 1：禁用 */
-    @Excel(name = "状态   0：启用 1：禁用")
+    /** status 状态   0：启用 1：禁用 */
+    @Excel(name = "status 状态   0：启用 1：禁用")
     @TableField("status")
-    @ApiModelProperty(value = "状态   0：启用 1：禁用")
-    private Integer status;
+    @ApiModelProperty(value = "status 状态   0：启用 1：禁用")
+    private Long status;
 
 }

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

@@ -0,0 +1,15 @@
+package com.miaxis.app.school.mapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.miaxis.app.school.domain.SchoolClassType;
+
+/**
+ * 驾校班型Mapper接口
+ *
+ * @author miaxis
+ * @date 2021-01-15
+ */
+public interface SchoolClassTypeMapper extends BaseMapper<SchoolClassType> {
+
+}

hzgzpt-service-app/src/main/java/com/miaxis/app/school/service/ISchoolClassTypeService.java

@@ -0,0 +1,21 @@
+package com.miaxis.app.school.service;
+
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.miaxis.app.school.domain.SchoolClassType;
+
+import java.util.List;
+
+/**
+ * 驾校班型Service接口
+ *
+ * @author wwl
+ * @date 2021-01-15
+ */
+public interface ISchoolClassTypeService extends IService<SchoolClassType> {
+    /**
+     * 查询列表
+     */
+    List<SchoolClassType> queryList(SchoolClassType schoolClassType);
+
+}

hzgzpt-service-app/src/main/java/com/miaxis/app/school/service/ISchoolEvaluateService.java

@@ -12,7 +12,7 @@ import java.util.List;
 /**
  * 驾校评价Service接口
  * 
- * @author miaxis
+ * @author wwl
  * @date 2020-12-28
  */
 public interface ISchoolEvaluateService extends IService<SchoolEvaluate> {
@@ -30,4 +30,10 @@ public interface ISchoolEvaluateService extends IService<SchoolEvaluate> {
      * @return
      */
     Response addSchoolEvaluate(SchoolEvaluateDto schoolEvaluateDto);
+
+    /**
+     * pc 查询列表
+     */
+    List<SchoolEvaluate> queryList(SchoolEvaluate schoolEvaluate);
+
 }

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

@@ -0,0 +1,81 @@
+package com.miaxis.app.school.service.impl;
+
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.miaxis.app.school.domain.SchoolClassType;
+import com.miaxis.app.school.mapper.SchoolClassTypeMapper;
+import com.miaxis.app.school.service.ISchoolClassTypeService;
+import org.springframework.stereotype.Service;
+import org.apache.commons.lang3.StringUtils;
+
+import java.util.List;
+
+
+/**
+ * 驾校班型Service业务层处理
+ *
+ * @author wwl
+ * @date 2021-01-15
+ */
+@Service
+public class SchoolClassTypeServiceImpl extends ServiceImpl<SchoolClassTypeMapper, SchoolClassType> implements ISchoolClassTypeService {
+
+    /**
+     * 班型查询列表
+     */
+    @Override
+    public List<SchoolClassType> queryList(SchoolClassType schoolClassType) {
+        LambdaQueryWrapper<SchoolClassType> lqw = Wrappers.lambdaQuery();
+                        if (StringUtils.isNotBlank(schoolClassType.getClassName())){
+            lqw.like(SchoolClassType::getClassName ,schoolClassType.getClassName());
+        }
+                                    if (schoolClassType.getTotalPrice() != null){
+            lqw.eq(SchoolClassType::getTotalPrice ,schoolClassType.getTotalPrice());
+        }
+                                    if (schoolClassType.getTrain() != null){
+            lqw.eq(SchoolClassType::getTrain ,schoolClassType.getTrain());
+        }
+                                    if (StringUtils.isNotBlank(schoolClassType.getPxcx())){
+            lqw.eq(SchoolClassType::getPxcx ,schoolClassType.getPxcx());
+        }
+                                    if (schoolClassType.getPayType() != null){
+            lqw.eq(SchoolClassType::getPayType ,schoolClassType.getPayType());
+        }
+                                    if (schoolClassType.getMinPrice() != null){
+            lqw.eq(SchoolClassType::getMinPrice ,schoolClassType.getMinPrice());
+        }
+                                    if (schoolClassType.getOneTime() != null){
+            lqw.eq(SchoolClassType::getOneTime ,schoolClassType.getOneTime());
+        }
+                                    if (schoolClassType.getTwoTime() != null){
+            lqw.eq(SchoolClassType::getTwoTime ,schoolClassType.getTwoTime());
+        }
+                                    if (schoolClassType.getThreeSimulationTime() != null){
+            lqw.eq(SchoolClassType::getThreeSimulationTime ,schoolClassType.getThreeSimulationTime());
+        }
+                                    if (schoolClassType.getThreePracticeTime() != null){
+            lqw.eq(SchoolClassType::getThreePracticeTime ,schoolClassType.getThreePracticeTime());
+        }
+                                    if (schoolClassType.getThreeTheoryTime() != null){
+            lqw.eq(SchoolClassType::getThreeTheoryTime ,schoolClassType.getThreeTheoryTime());
+        }
+                                    if (StringUtils.isNotBlank(schoolClassType.getPhotoUrl())){
+            lqw.eq(SchoolClassType::getPhotoUrl ,schoolClassType.getPhotoUrl());
+        }
+                                    if (schoolClassType.getRegionId() != null){
+            lqw.eq(SchoolClassType::getRegionId ,schoolClassType.getRegionId());
+        }
+                                    if (StringUtils.isNotBlank(schoolClassType.getPdfUrl())){
+            lqw.eq(SchoolClassType::getPdfUrl ,schoolClassType.getPdfUrl());
+        }
+                                    if (schoolClassType.getContractEndTime() != null){
+            lqw.eq(SchoolClassType::getContractEndTime ,schoolClassType.getContractEndTime());
+        }
+                                    if (schoolClassType.getCreateTime() != null){
+            lqw.eq(SchoolClassType::getCreateTime ,schoolClassType.getCreateTime());
+        }
+                    return this.list(lqw);
+    }
+}

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

@@ -2,7 +2,9 @@ package com.miaxis.app.school.service.impl;
 
 
 import com.alibaba.fastjson.JSONArray;
+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.app.school.domain.SchoolEvaluate;
 import com.miaxis.app.school.domain.SchoolEvaluateImages;
@@ -13,6 +15,7 @@ import com.miaxis.app.school.mapper.SchoolEvaluateMapper;
 import com.miaxis.app.school.service.ISchoolEvaluateImagesService;
 import com.miaxis.app.school.service.ISchoolEvaluateService;
 import com.miaxis.common.core.domain.Response;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -25,7 +28,7 @@ import java.util.Map;
 /**
  * 驾校评价Service业务层处理
  *
- * @author miaxis
+ * @author wwl
  * @date 2020-12-28
  */
 @Service
@@ -71,7 +74,7 @@ public class SchoolEvaluateServiceImpl extends ServiceImpl<SchoolEvaluateMapper,
             schoolEvaluate.setContent(schoolEvaluateDto.getContent());
             schoolEvaluate.setSchoolLabelIds(schoolEvaluateDto.getSchoolLabelIds());
             schoolEvaluate.setIsAnonymous(Long.valueOf(schoolEvaluateDto.getIsAnonymous()));
-            schoolEvaluate.setStatus(0);
+            schoolEvaluate.setStatus(0l);
             schoolEvaluateMapper.insert(schoolEvaluate);
 
             //保存照片
@@ -93,5 +96,40 @@ public class SchoolEvaluateServiceImpl extends ServiceImpl<SchoolEvaluateMapper,
         }
     }
 
+    /**
+     * pc 查询列表
+     */
+    @Override
+    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);
+    }
 
 }

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

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.miaxis.app.school.mapper.SchoolClassTypeMapper">
+
+    <resultMap type="SchoolClassType" id="SchoolClassTypeResult">
+        <result property="id"    column="id"    />
+        <result property="className"    column="class_name"    />
+        <result property="totalPrice"    column="total_price"    />
+        <result property="train"    column="train"    />
+        <result property="pxcx"    column="pxcx"    />
+        <result property="payType"    column="pay_type"    />
+        <result property="minPrice"    column="min_price"    />
+        <result property="oneTime"    column="one_time"    />
+        <result property="twoTime"    column="two_time"    />
+        <result property="threeSimulationTime"    column="three_simulation_time"    />
+        <result property="threePracticeTime"    column="three_practice_time"    />
+        <result property="threeTheoryTime"    column="three_theory_time"    />
+        <result property="photoUrl"    column="photo_url"    />
+        <result property="regionId"    column="region_id"    />
+        <result property="pdfUrl"    column="pdf_url"    />
+        <result property="contractEndTime"    column="contract_end_time"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateTime"    column="update_time"    />
+    </resultMap>
+
+</mapper>

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

@@ -19,9 +19,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="status"    column="status"    />
     </resultMap>
 
-    <sql id="selectSchoolEvaluateVo">
-        select id, inscode, content, attitude_starts, area_starts, user_id, create_time, total_starts, update_time, is_anonymous, school_label_ids, status from school_evaluate
-    </sql>
 
     
 </mapper>

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

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.miaxis.pc.school.mapper.SchoolClassTypeMapper">
+
+    <resultMap type="SchoolClassType" id="SchoolClassTypeResult">
+        <result property="id"    column="id"    />
+        <result property="className"    column="class_name"    />
+        <result property="totalPrice"    column="total_price"    />
+        <result property="train"    column="train"    />
+        <result property="pxcx"    column="pxcx"    />
+        <result property="payType"    column="pay_type"    />
+        <result property="minPrice"    column="min_price"    />
+        <result property="oneTime"    column="one_time"    />
+        <result property="twoTime"    column="two_time"    />
+        <result property="threeSimulationTime"    column="three_simulation_time"    />
+        <result property="threePracticeTime"    column="three_practice_time"    />
+        <result property="threeTheoryTime"    column="three_theory_time"    />
+        <result property="photoUrl"    column="photo_url"    />
+        <result property="regionId"    column="region_id"    />
+        <result property="pdfUrl"    column="pdf_url"    />
+        <result property="contractEndTime"    column="contract_end_time"    />
+        <result property="crdateTime"    column="crdate_time"    />
+        <result property="updateTime"    column="update_time"    />
+    </resultMap>
+
+</mapper>