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

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

@@ -3,8 +3,8 @@ package com.miaxis.app.controller.school;
 import com.miaxis.school.domain.SchoolInfo;
 import com.miaxis.school.dto.SchoolInfoDTO;
 import com.miaxis.school.dto.SchoolInfoEvalDTO;
-import com.miaxis.school.dto.SchoolInfoEvalVO;
-import com.miaxis.school.dto.SchoolInfoVO;
+import com.miaxis.school.vo.SchoolInfoEvalVO;
+import com.miaxis.school.vo.SchoolInfoVO;
 import com.miaxis.school.service.ISchoolInfoService;
 import com.miaxis.common.annotation.Log;
 import com.miaxis.common.constant.Constants;

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

@@ -10,6 +10,7 @@ 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.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.Arrays;
@@ -22,7 +23,7 @@ import java.util.List;
  * @date 2021-01-15
  */
 @RestController
-@RequestMapping("/open-api/coach/evaluate")
+@RequestMapping("/coach/evaluate")
 @Api(tags={"【pc-教练评价】"})
 public class PcCoachEvaluateController extends BaseController{
 
@@ -32,7 +33,7 @@ public class PcCoachEvaluateController extends BaseController{
     /**
      * 查询教练评价列表
      */
-    //@PreAuthorize("@ss.hasPermi('system:evaluate:list')")
+    @PreAuthorize("@ss.hasPermi('coach:evaluate:list')")
     @GetMapping("/list")
     @ApiOperation("查询教练评价列表")
     @ApiImplicitParams({
@@ -48,7 +49,7 @@ public class PcCoachEvaluateController extends BaseController{
     /**
      * 导出教练评价列表
      */
-   // @PreAuthorize("@ss.hasPermi('system:evaluate:export')")
+    @PreAuthorize("@ss.hasPermi('coach:evaluate:export')")
     @Log(title = "教练评价", businessType = BusinessTypeEnum.EXPORT)
     @GetMapping("/export")
     @ApiOperation("导出教练评价列表Excel")
@@ -61,7 +62,7 @@ public class PcCoachEvaluateController extends BaseController{
     /**
      * 获取教练评价详细信息
      */
-    //@PreAuthorize("@ss.hasPermi('system:evaluate:query')")
+    @PreAuthorize("@ss.hasPermi('coach:evaluate:query')")
     @GetMapping(value = "/{id}")
     @ApiOperation("获取教练评价详细信息")
     public Response<CoachEvaluate> getInfo(
@@ -74,7 +75,7 @@ public class PcCoachEvaluateController extends BaseController{
     /**
      * 新增教练评价
      */
-    //@PreAuthorize("@ss.hasPermi('system:evaluate:add')")
+    @PreAuthorize("@ss.hasPermi('coach:evaluate:add')")
     @Log(title = "教练评价", businessType = BusinessTypeEnum.INSERT)
     @PostMapping
     @ApiOperation("新增教练评价")
@@ -85,7 +86,7 @@ public class PcCoachEvaluateController extends BaseController{
     /**
      * 修改教练评价
      */
-    //@PreAuthorize("@ss.hasPermi('system:evaluate:edit')")
+    @PreAuthorize("@ss.hasPermi('coach:evaluate:edit')")
     @Log(title = "教练评价", businessType = BusinessTypeEnum.UPDATE)
     @PutMapping
     @ApiOperation("修改教练评价")
@@ -96,7 +97,7 @@ public class PcCoachEvaluateController extends BaseController{
     /**
      * 删除教练评价
      */
-    //@PreAuthorize("@ss.hasPermi('system:evaluate:remove')")
+    @PreAuthorize("@ss.hasPermi('coach:evaluate:remove')")
     @Log(title = "教练评价", businessType = BusinessTypeEnum.DELETE)
 	@DeleteMapping("/{ids}")
     @ApiOperation("删除教练评价")

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

@@ -5,12 +5,15 @@ import java.util.Arrays;
 
 
 import com.miaxis.coach.domain.CoachInfo;
+import com.miaxis.coach.dto.CoachInfoPcDTO;
 import com.miaxis.coach.service.ICoachInfoService;
+import com.miaxis.coach.vo.CoachInfoPcVO;
 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.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.PutMapping;
@@ -31,7 +34,7 @@ import com.miaxis.common.enums.BusinessTypeEnum;
  * @date 2021-01-15
  */
 @RestController
-@RequestMapping("/open-api/coach")
+@RequestMapping("/coach/info")
 @Api(tags={"【pc-教练】"})
 public class PcCoachInfoController extends BaseController{
 
@@ -39,38 +42,25 @@ public class PcCoachInfoController extends BaseController{
     private ICoachInfoService coachInfoService;
 
     /**
-     * 查询教练列表
+     * pc查询教练列表
      */
-    //@PreAuthorize("@ss.hasPermi('open-api/coach:info: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){
+    public ResponsePageInfo<CoachInfoPcVO> list(@ModelAttribute CoachInfoPcDTO coachInfo){
         startPage();
-        List<CoachInfo> list = coachInfoService.queryList(coachInfo);
+        List<CoachInfoPcVO> 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')")
+    @PreAuthorize("@ss.hasPermi('coach:info:query')")
     @GetMapping(value = "/{coachnum}")
     @ApiOperation("获取教练详细信息")
     public Response<CoachInfo> getInfo(
@@ -83,7 +73,7 @@ public class PcCoachInfoController extends BaseController{
     /**
      * 新增教练
      */
-    //@PreAuthorize("@ss.hasPermi('open-api/coach:info:add')")
+    @PreAuthorize("@ss.hasPermi('coach:info:add')")
     @Log(title = "教练", businessType = BusinessTypeEnum.INSERT)
     @PostMapping
     @ApiOperation("新增教练")
@@ -94,7 +84,7 @@ public class PcCoachInfoController extends BaseController{
     /**
      * 修改教练
      */
-    //@PreAuthorize("@ss.hasPermi('open-api/coach:info:edit')")
+    @PreAuthorize("@ss.hasPermi('coach:info:edit')")
     @Log(title = "教练", businessType = BusinessTypeEnum.UPDATE)
     @PutMapping
     @ApiOperation("修改教练")
@@ -105,7 +95,7 @@ public class PcCoachInfoController extends BaseController{
     /**
      * 删除教练
      */
-    //@PreAuthorize("@ss.hasPermi('open-api/coach:info:remove')")
+    @PreAuthorize("@ss.hasPermi('coach:info:remove')")
     @Log(title = "教练", businessType = BusinessTypeEnum.DELETE)
 	@DeleteMapping("/{coachnums}")
     @ApiOperation("删除教练")

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

@@ -1,6 +1,7 @@
 package com.miaxis.pc.controller.school;
 
 import com.miaxis.school.domain.SchoolClassType;
+import com.miaxis.school.dto.SchoolClassTypePcDTO;
 import com.miaxis.school.service.ISchoolClassTypeService;
 import com.miaxis.common.annotation.Log;
 import com.miaxis.common.core.controller.BaseController;
@@ -8,8 +9,10 @@ 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 com.miaxis.school.vo.SchoolClassTypePcVO;
 import io.swagger.annotations.*;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.Arrays;
@@ -23,7 +26,7 @@ import java.util.List;
  * @date 2021-01-15
  */
 @RestController
-@RequestMapping("/open-api/school/type")
+@RequestMapping("/school/classType")
 @Api(tags={"【pc-驾校班型】"})
 public class PcSchoolClassTypeController extends BaseController{
 
@@ -33,36 +36,24 @@ public class PcSchoolClassTypeController extends BaseController{
     /**
      * 查询驾校班型列表
      */
-//    @PreAuthorize("@ss.hasPermi('school:type:list')")
+    @PreAuthorize("@ss.hasPermi('school:classType: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){
+    public ResponsePageInfo<SchoolClassTypePcVO> list(@ModelAttribute SchoolClassTypePcDTO schoolClassTypePcDTO){
         startPage();
-        List<SchoolClassType> list = schoolClassTypeService.queryList(schoolClassType);
+        List<SchoolClassTypePcVO> list = schoolClassTypeService.queryList(schoolClassTypePcDTO);
         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')")
+    @PreAuthorize("@ss.hasPermi('school:classType:query')")
     @GetMapping(value = "/{id}")
     @ApiOperation("获取驾校班型详细信息")
     public Response<SchoolClassType> getInfo(
@@ -75,7 +66,7 @@ public class PcSchoolClassTypeController extends BaseController{
     /**
      * 新增驾校班型
      */
-//    @PreAuthorize("@ss.hasPermi('school:type:add')")
+    @PreAuthorize("@ss.hasPermi('school:classType:add')")
     @Log(title = "驾校班型", businessType = BusinessTypeEnum.INSERT)
     @PostMapping
     @ApiOperation("新增驾校班型")
@@ -86,7 +77,7 @@ public class PcSchoolClassTypeController extends BaseController{
     /**
      * 修改驾校班型
      */
-//    @PreAuthorize("@ss.hasPermi('school:type:edit')")
+    @PreAuthorize("@ss.hasPermi('school:classType:edit')")
     @Log(title = "驾校班型", businessType = BusinessTypeEnum.UPDATE)
     @PutMapping
     @ApiOperation("修改驾校班型")
@@ -97,7 +88,7 @@ public class PcSchoolClassTypeController extends BaseController{
     /**
      * 删除驾校班型
      */
-//    @PreAuthorize("@ss.hasPermi('school:type:remove')")
+    @PreAuthorize("@ss.hasPermi('school:class:type:remove')")
     @Log(title = "驾校班型", businessType = BusinessTypeEnum.DELETE)
 	@DeleteMapping("/{ids}")
     @ApiOperation("删除驾校班型")

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

@@ -8,6 +8,7 @@ import java.util.Arrays;
 import io.swagger.annotations.*;
 import com.miaxis.common.core.domain.Response;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.PutMapping;
@@ -30,7 +31,7 @@ import com.miaxis.common.core.page.ResponsePageInfo;
  * @date 2021-01-15
  */
 @RestController
-@RequestMapping("/open-api/system/evaluate")
+@RequestMapping("/school/evaluate")
 @Api(tags={"【pc-驾校评价】"})
 public class PcSchoolEvaluateController extends BaseController{
 
@@ -40,7 +41,7 @@ public class PcSchoolEvaluateController extends BaseController{
     /**
      * 查询驾校评价列表
      */
-    //@PreAuthorize("@ss.hasPermi('system:evaluate:list')")
+    @PreAuthorize("@ss.hasPermi('school:evaluate:list')")
     @GetMapping("/list")
     @ApiOperation("查询驾校评价列表")
     @ApiImplicitParams({
@@ -56,7 +57,7 @@ public class PcSchoolEvaluateController extends BaseController{
     /**
      * 导出驾校评价列表
      */
-   // @PreAuthorize("@ss.hasPermi('system:evaluate:export')")
+    @PreAuthorize("@ss.hasPermi('school:evaluate:export')")
     @Log(title = "驾校评价", businessType = BusinessTypeEnum.EXPORT)
     @GetMapping("/export")
     @ApiOperation("导出驾校评价列表Excel")
@@ -69,7 +70,7 @@ public class PcSchoolEvaluateController extends BaseController{
     /**
      * 获取驾校评价详细信息
      */
-    //@PreAuthorize("@ss.hasPermi('system:evaluate:query')")
+    @PreAuthorize("@ss.hasPermi('school:evaluate:query')")
     @GetMapping(value = "/{id}")
     @ApiOperation("获取驾校评价详细信息")
     public Response<SchoolEvaluate> getInfo(
@@ -82,7 +83,7 @@ public class PcSchoolEvaluateController extends BaseController{
     /**
      * 新增驾校评价
      */
-    //@PreAuthorize("@ss.hasPermi('system:evaluate:add')")
+    @PreAuthorize("@ss.hasPermi('school:evaluate:add')")
     @Log(title = "驾校评价", businessType = BusinessTypeEnum.INSERT)
     @PostMapping
     @ApiOperation("新增驾校评价")
@@ -93,7 +94,7 @@ public class PcSchoolEvaluateController extends BaseController{
     /**
      * 修改驾校评价
      */
-    //@PreAuthorize("@ss.hasPermi('system:evaluate:edit')")
+    @PreAuthorize("@ss.hasPermi('school:evaluate:edit')")
     @Log(title = "驾校评价", businessType = BusinessTypeEnum.UPDATE)
     @PutMapping
     @ApiOperation("修改驾校评价")
@@ -104,7 +105,7 @@ public class PcSchoolEvaluateController extends BaseController{
     /**
      * 删除驾校评价
      */
-    //@PreAuthorize("@ss.hasPermi('system:evaluate:remove')")
+    @PreAuthorize("@ss.hasPermi('school:evaluate:remove')")
     @Log(title = "驾校评价", businessType = BusinessTypeEnum.DELETE)
 	@DeleteMapping("/{ids}")
     @ApiOperation("删除驾校评价")

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

@@ -0,0 +1,99 @@
+package com.miaxis.pc.controller.school;
+
+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.school.domain.SchoolInfo;
+import com.miaxis.school.dto.SchoolInfoPcDTO;
+import com.miaxis.school.service.ISchoolInfoService;
+import com.miaxis.school.vo.SchoolInfoDetailPcVO;
+import com.miaxis.school.vo.SchoolInfoPcVO;
+import io.swagger.annotations.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 【驾校】Controller
+ *
+ * @author wwl
+ * @date 2021-01-18
+ */
+@RestController
+@RequestMapping("/school/info")
+@Api(tags={"【pc-驾校】"})
+public class PcSchoolInfoController extends BaseController{
+
+    @Autowired
+    private ISchoolInfoService schoolInfoService;
+
+    /**
+     * 查询驾校列表
+     */
+    @PreAuthorize("@ss.hasPermi('school: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<SchoolInfoPcVO> list(@ModelAttribute SchoolInfoPcDTO schoolInfoPcDTO){
+        startPage();
+        List<SchoolInfoPcVO> list = schoolInfoService.queryList(schoolInfoPcDTO);
+        return toResponsePageInfo(list);
+    }
+
+
+    /**
+     * 获取驾校详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('school:info:query')")
+    @GetMapping(value = "/{inscode}")
+    @ApiOperation("获取驾校详细信息")
+    public Response<SchoolInfoDetailPcVO> getSchoolInfoDetail(
+            @ApiParam(name = "inscode", value = "驾校全国统一编号", required = true)
+            @PathVariable("inscode") String inscode
+    ){
+        return Response.success(schoolInfoService.getSchoolInfoDetail(inscode));
+    }
+
+    /**
+     * 新增驾校
+     */
+    @PreAuthorize("@ss.hasPermi('school:info:add')")
+    @Log(title = "驾校", businessType = BusinessTypeEnum.INSERT)
+    @PostMapping
+    @ApiOperation("新增驾校")
+    public Response<Integer> add(@RequestBody SchoolInfo schoolInfo){
+        return toResponse(schoolInfoService.save(schoolInfo) ? 1 : 0);
+    }
+
+    /**
+     * 修改驾校
+     */
+    @PreAuthorize("@ss.hasPermi('school:info:edit')")
+    @Log(title = "驾校", businessType = BusinessTypeEnum.UPDATE)
+    @PutMapping
+    @ApiOperation("修改驾校")
+    public Response<Integer> edit(@RequestBody SchoolInfo schoolInfo){
+        return toResponse(schoolInfoService.updateById(schoolInfo) ? 1 : 0);
+    }
+
+    /**
+     * 删除驾校(逻辑删除)
+     */
+    @PreAuthorize("@ss.hasPermi('school:info:remove')")
+    @Log(title = "驾校", businessType = BusinessTypeEnum.UPDATE)
+	@PostMapping("/{inscodes}")
+    @ApiOperation("删除驾校(逻辑删除)")
+    public  Response<Integer> updateByInscode(
+            @ApiParam(name = "inscodes", value = "驾校全国统一编号集合参数", required = true)
+            @PathVariable String[] inscodes
+    ){
+        return toResponse(schoolInfoService.updateByInscode(inscodes) ? 1 : 0);
+    }
+}

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

@@ -116,140 +116,4 @@ public class CoachInfo extends BaseBusinessEntity {
     @ApiModelProperty(value = "点赞数")
     private Long fabulous;
 
-    public void setCoachnum(String coachnum){
-        this.coachnum = coachnum;
-    }
-
-    public String getCoachnum(){
-        return coachnum;
-    }
-    public void setName(String name){
-        this.name = name;
-    }
-
-    public String getName(){
-        return name;
-    }
-    public void setSex(Long sex){
-        this.sex = sex;
-    }
-
-    public Long getSex(){
-        return sex;
-    }
-    public void setInscode(String inscode){
-        this.inscode = inscode;
-    }
-
-    public String getInscode(){
-        return inscode;
-    }
-    public void setIdcard(String idcard){
-        this.idcard = idcard;
-    }
-
-    public String getIdcard(){
-        return idcard;
-    }
-    public void setMobile(String mobile){
-        this.mobile = mobile;
-    }
-
-    public String getMobile(){
-        return mobile;
-    }
-    public void setAddress(String address){
-        this.address = address;
-    }
-
-    public String getAddress(){
-        return address;
-    }
-    public void setPhoto(Long photo){
-        this.photo = photo;
-    }
-
-    public Long getPhoto(){
-        return photo;
-    }
-    public void setDripermitted(String dripermitted){
-        this.dripermitted = dripermitted;
-    }
-
-    public String getDripermitted(){
-        return dripermitted;
-    }
-    public void setTeachpermitted(String teachpermitted){
-        this.teachpermitted = teachpermitted;
-    }
-
-    public String getTeachpermitted(){
-        return teachpermitted;
-    }
-    public void setDistrict(String district){
-        this.district = district;
-    }
-
-    public String getDistrict(){
-        return district;
-    }
-    public void setEmploystatus(Long employstatus){
-        this.employstatus = employstatus;
-    }
-
-    public Long getEmploystatus(){
-        return employstatus;
-    }
-    public void setStopTrain(Long stopTrain){
-        this.stopTrain = stopTrain;
-    }
-
-    public Long getStopTrain(){
-        return stopTrain;
-    }
-    public void setWechar(String wechar){
-        this.wechar = wechar;
-    }
-
-    public String getWechar(){
-        return wechar;
-    }
-    public void setOpenid(String openid){
-        this.openid = openid;
-    }
-
-    public String getOpenid(){
-        return openid;
-    }
-    public void setFabulous(Long fabulous){
-        this.fabulous = fabulous;
-    }
-
-    public Long getFabulous(){
-        return fabulous;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("coachnum", getCoachnum())
-            .append("name", getName())
-            .append("sex", getSex())
-            .append("inscode", getInscode())
-            .append("idcard", getIdcard())
-            .append("mobile", getMobile())
-            .append("address", getAddress())
-            .append("photo", getPhoto())
-            .append("dripermitted", getDripermitted())
-            .append("teachpermitted", getTeachpermitted())
-            .append("district", getDistrict())
-            .append("employstatus", getEmploystatus())
-            .append("stopTrain", getStopTrain())
-            .append("wechar", getWechar())
-            .append("openid", getOpenid())
-            .append("createTime", getCreateTime())
-            .append("updateTime", getUpdateTime())
-            .append("fabulous", getFabulous())
-            .toString();
-    }
 }

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

@@ -0,0 +1,47 @@
+package com.miaxis.coach.dto;
+
+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-18
+ */
+@Data
+@ApiModel(value = "CoachInfo", description = "pc教练对象入参")
+public class CoachInfoPcDTO {
+
+    /** 教练员全国统一编号 */
+    @ApiModelProperty(value = "教练员全国统一编号")
+    private String coachnum;
+
+    /** 教练员性名 */
+    @ApiModelProperty(value = "教练员性名")
+    private String name;
+
+    /** 性别 ：1男  2女 */
+    @ApiModelProperty(value = "性别 ：1男  2女")
+    private String sex;
+
+    /** 身份证明号码 */
+    @ApiModelProperty(value = "身份证明号码")
+    private String idcard;
+
+    /** 手机号码 */
+    @ApiModelProperty(value = "手机号码")
+    private String mobile;
+
+
+    /** 准驾车型 */
+    @ApiModelProperty(value = "准驾车型")
+    private String dripermitted;
+
+
+
+}

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

@@ -3,7 +3,9 @@ package com.miaxis.coach.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.miaxis.coach.domain.CoachInfo;
 import com.miaxis.coach.dto.CoachInfoDTO;
+import com.miaxis.coach.dto.CoachInfoPcDTO;
 import com.miaxis.coach.dto.CoachInfoVO;
+import com.miaxis.coach.vo.CoachInfoPcVO;
 
 import java.util.List;
 
@@ -66,4 +68,11 @@ public interface CoachInfoMapper extends BaseMapper<CoachInfo> {
      * 查询教练列表 带头像距离信息
      */
     public List<CoachInfoVO> selectCoachInfoUrlList(CoachInfoDTO coachInfoDTO);
+
+    /**
+     * pc查询教练列表
+     * @param coachInfo
+     * @return
+     */
+    List<CoachInfoPcVO> queryList(CoachInfoPcDTO coachInfo);
 }

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

@@ -4,7 +4,9 @@ import java.util.List;
 import com.miaxis.coach.domain.CoachInfo;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.miaxis.coach.dto.CoachInfoDTO;
+import com.miaxis.coach.dto.CoachInfoPcDTO;
 import com.miaxis.coach.dto.CoachInfoVO;
+import com.miaxis.coach.vo.CoachInfoPcVO;
 
 /**
  * 教练Service接口
@@ -69,8 +71,8 @@ public interface ICoachInfoService extends IService<CoachInfo>{
     public List<CoachInfoVO> selectCoachInfoUrlList(CoachInfoDTO coachInfoDTO);
 
     /**
-     * pc 查询列表
+     * pc查询教练列表
      */
-    List<CoachInfo> queryList(CoachInfo coachInfo);
+    List<CoachInfoPcVO> queryList(CoachInfoPcDTO coachInfo);
 
 }

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

@@ -6,7 +6,9 @@ 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.coach.dto.CoachInfoDTO;
+import com.miaxis.coach.dto.CoachInfoPcDTO;
 import com.miaxis.coach.dto.CoachInfoVO;
+import com.miaxis.coach.vo.CoachInfoPcVO;
 import com.miaxis.common.utils.DateUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -14,6 +16,9 @@ import org.springframework.stereotype.Service;
 import com.miaxis.coach.mapper.CoachInfoMapper;
 import com.miaxis.coach.domain.CoachInfo;
 import com.miaxis.coach.service.ICoachInfoService;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
 
 /**
  * 教练Service业务层处理
@@ -23,7 +28,8 @@ import com.miaxis.coach.service.ICoachInfoService;
  */
 @Service
 public class CoachInfoServiceImpl extends ServiceImpl<CoachInfoMapper, CoachInfo> implements ICoachInfoService {
-    @Autowired
+
+    @Resource
     private CoachInfoMapper coachInfoMapper;
 
     /**
@@ -101,57 +107,11 @@ public class CoachInfoServiceImpl extends ServiceImpl<CoachInfoMapper, CoachInfo
     }
 
     /**
-     * pc 查询列表
+     * 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);
+    public List<CoachInfoPcVO> queryList(CoachInfoPcDTO coachInfo) {
+        return coachInfoMapper.queryList(coachInfo);
     }
 
 }

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

@@ -0,0 +1,55 @@
+package com.miaxis.coach.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-18
+ */
+@Data
+@ApiModel(value = "CoachInfo", description = "pc教练返回对象")
+public class CoachInfoPcVO {
+
+    /** 教练员全国统一编号 */
+    @ApiModelProperty(value = "教练员全国统一编号")
+    private String coachnum;
+
+    /** 教练员性名 */
+    @ApiModelProperty(value = "教练员性名")
+    private String name;
+
+    /** 性别 ：1男  2女 */
+    @ApiModelProperty(value = "性别 ：1男  2女")
+    private String sex;
+
+    /** 驾校全国统一编号 */
+    @ApiModelProperty(value = "驾校全国统一编号")
+    private String inscode;
+
+    /** 身份证明号码 */
+    @ApiModelProperty(value = "身份证明号码")
+    private String idcard;
+
+    /** 手机号码 */
+    @ApiModelProperty(value = "手机号码")
+    private String mobile;
+
+
+    /** 准驾车型 */
+    @ApiModelProperty(value = "准驾车型")
+    private String dripermitted;
+
+    /** 创建时间 */
+    @ApiModelProperty(value = "创建时间"  ,hidden = true)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+
+
+}

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

@@ -255,263 +255,5 @@ public class SchoolInfo extends BaseBusinessEntity {
     private String yzCode;
 
 
-    public void setInscode(String inscode) {
-        this.inscode = inscode;
-    }
 
-    public String getInscode() {
-        return inscode;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setSname(String sname) {
-        this.sname = sname;
-    }
-
-    public String getSname() {
-        return sname;
-    }
-
-    public void setAddress(String address) {
-        this.address = address;
-    }
-
-    public String getAddress() {
-        return address;
-    }
-
-    public void setLegalPersonIdNumber(String legalPersonIdNumber) {
-        this.legalPersonIdNumber = legalPersonIdNumber;
-    }
-
-    public String getLegalPersonIdNumber() {
-        return legalPersonIdNumber;
-    }
-
-    public void setResponsiblePerson(String responsiblePerson) {
-        this.responsiblePerson = responsiblePerson;
-    }
-
-    public String getResponsiblePerson() {
-        return responsiblePerson;
-    }
-
-    public void setLegalPersonName(String legalPersonName) {
-        this.legalPersonName = legalPersonName;
-    }
-
-    public String getLegalPersonName() {
-        return legalPersonName;
-    }
-
-    public void setAreaName(String areaName) {
-        this.areaName = areaName;
-    }
-
-    public String getAreaName() {
-        return areaName;
-    }
-
-    public void setAreaCode(String areaCode) {
-        this.areaCode = areaCode;
-    }
-
-    public String getAreaCode() {
-        return areaCode;
-    }
-
-    public void setTel(String tel) {
-        this.tel = tel;
-    }
-
-    public String getTel() {
-        return tel;
-    }
-
-    public void setWechar(String wechar) {
-        this.wechar = wechar;
-    }
-
-    public String getWechar() {
-        return wechar;
-    }
-
-    public void setRegistrationDate(Date registrationDate) {
-        this.registrationDate = registrationDate;
-    }
-
-    public Date getRegistrationDate() {
-        return registrationDate;
-    }
-
-    public void setLicenseNumber(String licenseNumber) {
-        this.licenseNumber = licenseNumber;
-    }
-
-    public String getLicenseNumber() {
-        return licenseNumber;
-    }
-
-    public void setLicenseWord(String licenseWord) {
-        this.licenseWord = licenseWord;
-    }
-
-    public String getLicenseWord() {
-        return licenseWord;
-    }
-
-    public void setLicenseValidPeriodFrom(Date licenseValidPeriodFrom) {
-        this.licenseValidPeriodFrom = licenseValidPeriodFrom;
-    }
-
-    public Date getLicenseValidPeriodFrom() {
-        return licenseValidPeriodFrom;
-    }
-
-    public void setLicenseValidPeriodEnd(Date licenseValidPeriodEnd) {
-        this.licenseValidPeriodEnd = licenseValidPeriodEnd;
-    }
-
-    public Date getLicenseValidPeriodEnd() {
-        return licenseValidPeriodEnd;
-    }
-
-    public void setCredibilityGrade(String credibilityGrade) {
-        this.credibilityGrade = credibilityGrade;
-    }
-
-    public String getCredibilityGrade() {
-        return credibilityGrade;
-    }
-
-    public void setCredibilityScore(String credibilityScore) {
-        this.credibilityScore = credibilityScore;
-    }
-
-    public String getCredibilityScore() {
-        return credibilityScore;
-    }
-
-    public void setVehicleSum(Long vehicleSum) {
-        this.vehicleSum = vehicleSum;
-    }
-
-    public Long getVehicleSum() {
-        return vehicleSum;
-    }
-
-    public void setRegcapital(Long regcapital) {
-        this.regcapital = regcapital;
-    }
-
-    public Long getRegcapital() {
-        return regcapital;
-    }
-
-    public void setBizlicense(String bizlicense) {
-        this.bizlicense = bizlicense;
-    }
-
-    public String getBizlicense() {
-        return bizlicense;
-    }
-
-    public void setPoiLon(BigDecimal poiLon) {
-        this.poiLon = poiLon;
-    }
-
-    public BigDecimal getPoiLon() {
-        return poiLon;
-    }
-
-    public void setPoiLat(BigDecimal poiLat) {
-        this.poiLat = poiLat;
-    }
-
-    public BigDecimal getPoiLat() {
-        return poiLat;
-    }
-
-    public void setRemoved(Long removed) {
-        this.removed = removed;
-    }
-
-    public Long getRemoved() {
-        return removed;
-    }
-
-    public void setInitialReceiptDate(Date initialReceiptDate) {
-        this.initialReceiptDate = initialReceiptDate;
-    }
-
-    public Date getInitialReceiptDate() {
-        return initialReceiptDate;
-    }
-
-    public void setBusinessStatusName(String businessStatusName) {
-        this.businessStatusName = businessStatusName;
-    }
-
-    public String getBusinessStatusName() {
-        return businessStatusName;
-    }
-
-    public void setPxcx(String pxcx) {
-        this.pxcx = pxcx;
-    }
-
-    public String getPxcx() {
-        return pxcx;
-    }
-
-    public String getYzCode() {
-        return yzCode;
-    }
-
-    public void setYzCode(String yzCode) {
-        this.yzCode = yzCode;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
-                .append("inscode", getInscode())
-                .append("name", getName())
-                .append("sname", getSname())
-                .append("address", getAddress())
-                .append("legalPersonIdNumber", getLegalPersonIdNumber())
-                .append("responsiblePerson", getResponsiblePerson())
-                .append("legalPersonName", getLegalPersonName())
-                .append("areaName", getAreaName())
-                .append("areaCode", getAreaCode())
-                .append("tel", getTel())
-                .append("wechar", getWechar())
-                .append("registrationDate", getRegistrationDate())
-                .append("licenseNumber", getLicenseNumber())
-                .append("licenseWord", getLicenseWord())
-                .append("licenseValidPeriodFrom", getLicenseValidPeriodFrom())
-                .append("licenseValidPeriodEnd", getLicenseValidPeriodEnd())
-                .append("credibilityGrade", getCredibilityGrade())
-                .append("credibilityScore", getCredibilityScore())
-                .append("vehicleSum", getVehicleSum())
-                .append("regcapital", getRegcapital())
-                .append("bizlicense", getBizlicense())
-                .append("poiLon", getPoiLon())
-                .append("poiLat", getPoiLat())
-                .append("removed", getRemoved())
-                .append("createTime", getCreateTime())
-                .append("updateTime", getUpdateTime())
-                .append("initialReceiptDate", getInitialReceiptDate())
-                .append("businessStatusName", getBusinessStatusName())
-                .append("pxcx", getPxcx())
-                .append("yzCode", getYzCode())
-                .toString();
-    }
 }

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

@@ -0,0 +1,40 @@
+package com.miaxis.school.dto;
+
+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;
+
+/**
+ * pc驾校班型对象入参
+ *
+ * @author WWL
+ * @date 2020-1-18
+ */
+@Data
+@ApiModel(value = "SchoolClassType", description = "pc驾校班型对象入参")
+public class SchoolClassTypePcDTO extends BaseBusinessEntity{
+
+    /** 班级名称 */
+    @ApiModelProperty(value = "班级名称")
+    private String className;
+
+    /** 总价 */
+    @ApiModelProperty(value = "总价")
+    private Long totalPrice;
+
+    /** 学时 */
+    @Excel(name = "学时")
+    @ApiModelProperty(value = "学时")
+    private Long train;
+
+    /** 车型 */
+    @ApiModelProperty(value = "车型")
+    private String pxcx;
+
+    /** 收费方式 1:一次性 2:先学后付 3:计时收费 */
+    @ApiModelProperty(value = "收费方式 1:一次性 2:先学后付 3:计时收费")
+    private Integer payType;
+
+}

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

@@ -0,0 +1,116 @@
+package com.miaxis.school.dto;
+
+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 java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * pc驾校对象入参
+ *
+ * @author WWL
+ * @date 2020-1-18
+ */
+@Data
+@ApiModel(value = "SchoolInfo", description = "pc驾校对象入参")
+public class SchoolInfoPcDTO extends BaseBusinessEntity {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 驾校全国统一编号
+     */
+    @ApiModelProperty(value = "驾校全国统一编号")
+    private String inscode;
+
+    /**
+     * 驾校名称
+     */
+    @ApiModelProperty(value = "驾校名称")
+    private String name;
+
+    /**
+     * 驾校简称
+     */
+    @TableField("sname")
+    @ApiModelProperty(value = "驾校简称")
+    private String sname;
+
+    /**
+     * 驾校地址
+     */
+    @ApiModelProperty(value = "驾校地址")
+    private String address;
+
+
+    /**
+     * 经营负责人
+     */
+    @TableField("responsible_person")
+    @ApiModelProperty(value = "经营负责人")
+    private String responsiblePerson;
+
+    /**
+     * 行政区划名称
+     */
+    @ApiModelProperty(value = "行政区划名称")
+    private String areaName;
+
+    /**
+     * 行政区划代码
+     */
+    @ApiModelProperty(value = "行政区划代码")
+    private String areaCode;
+
+    /**
+     * 驾校电话
+     */
+    @ApiModelProperty(value = "驾校电话")
+    private String tel;
+
+
+    /**
+     * 上年度信用等级
+     */
+    @ApiModelProperty(value = "上年度信用等级")
+    private String credibilityGrade;
+
+    /**
+     * 当前信用得分
+     */
+    @ApiModelProperty(value = "当前信用得分")
+    private String credibilityScore;
+
+
+    /**
+     * 逻辑删除标识（1：是；0：否）
+     */
+    @ApiModelProperty(value = "逻辑删除标识（1：是；0：否）")
+    private Long removed;
+
+    /**
+     * 业户经营状态
+     */
+    @ApiModelProperty(value = "业户经营状态")
+    private String businessStatusName;
+
+    /**
+     * 开始时间
+     */
+    @ApiModelProperty(value = "开始时间")
+    private Date startTime;
+
+    /**
+     * 结束时间
+     */
+    @ApiModelProperty(value = "结束时间")
+    private Date endTime;
+
+}

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

@@ -3,6 +3,10 @@ package com.miaxis.school.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.miaxis.school.domain.SchoolClassType;
+import com.miaxis.school.dto.SchoolClassTypePcDTO;
+import com.miaxis.school.vo.SchoolClassTypePcVO;
+
+import java.util.List;
 
 /**
  * 驾校班型Mapper接口
@@ -12,4 +16,10 @@ import com.miaxis.school.domain.SchoolClassType;
  */
 public interface SchoolClassTypeMapper extends BaseMapper<SchoolClassType> {
 
+    /**
+     * pc班型查询列表
+     * @param schoolClassTypePcDTO
+     * @return
+     */
+    List<SchoolClassTypePcVO> queryList(SchoolClassTypePcDTO schoolClassTypePcDTO);
 }

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

@@ -6,8 +6,12 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.miaxis.school.domain.SchoolInfo;
 import com.miaxis.school.dto.SchoolInfoDTO;
 import com.miaxis.school.dto.SchoolInfoEvalDTO;
-import com.miaxis.school.dto.SchoolInfoEvalVO;
-import com.miaxis.school.dto.SchoolInfoVO;
+import com.miaxis.school.dto.SchoolInfoPcDTO;
+import com.miaxis.school.vo.SchoolInfoDetailPcVO;
+import com.miaxis.school.vo.SchoolInfoEvalVO;
+import com.miaxis.school.vo.SchoolInfoPcVO;
+import com.miaxis.school.vo.SchoolInfoVO;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 驾校Mapper接口
@@ -80,4 +84,24 @@ public interface SchoolInfoMapper extends BaseMapper<SchoolInfo> {
      * @return 结果
      */
     public int deleteSchoolInfoByIds(String[] inscodes);
+
+    /**
+     * pc驾校列表查询
+     * @param schoolInfoPcDTO
+     * @return
+     */
+    List<SchoolInfoPcVO> queryList(SchoolInfoPcDTO schoolInfoPcDTO);
+
+    /**
+     * pc查询驾校详情
+     * @param inscode
+     * @return
+     */
+    SchoolInfoDetailPcVO getSchoolInfoDetail(String inscode);
+
+    /**
+     * pc删除驾校(逻辑删除)
+     * @param inscodes
+     */
+    void updateByInscode(@Param("arr")String[] inscodes);
 }

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

@@ -3,6 +3,8 @@ package com.miaxis.school.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.miaxis.school.domain.SchoolClassType;
+import com.miaxis.school.dto.SchoolClassTypePcDTO;
+import com.miaxis.school.vo.SchoolClassTypePcVO;
 
 import java.util.List;
 
@@ -14,8 +16,8 @@ import java.util.List;
  */
 public interface ISchoolClassTypeService extends IService<SchoolClassType> {
     /**
-     * 查询列表
+     * pc驾校班型查询列表
      */
-    List<SchoolClassType> queryList(SchoolClassType schoolClassType);
+    List<SchoolClassTypePcVO> queryList(SchoolClassTypePcDTO schoolClassTypePcDTO);
 
 }

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

@@ -4,8 +4,11 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.miaxis.school.domain.SchoolInfo;
 import com.miaxis.school.dto.SchoolInfoDTO;
 import com.miaxis.school.dto.SchoolInfoEvalDTO;
-import com.miaxis.school.dto.SchoolInfoEvalVO;
-import com.miaxis.school.dto.SchoolInfoVO;
+import com.miaxis.school.dto.SchoolInfoPcDTO;
+import com.miaxis.school.vo.SchoolInfoDetailPcVO;
+import com.miaxis.school.vo.SchoolInfoEvalVO;
+import com.miaxis.school.vo.SchoolInfoPcVO;
+import com.miaxis.school.vo.SchoolInfoVO;
 
 import java.util.List;
 
@@ -80,4 +83,24 @@ public interface ISchoolInfoService extends IService<SchoolInfo>{
      * @return 结果
      */
     public int deleteSchoolInfoById(String inscode);
+
+
+    /**
+     * pc查询列表
+     */
+    List<SchoolInfoPcVO> queryList(SchoolInfoPcDTO schoolInfoPcDTO);
+
+    /**
+     * pc查询驾校详情
+     * @param inscode
+     * @return
+     */
+    SchoolInfoDetailPcVO getSchoolInfoDetail(String inscode);
+
+    /**
+     * pc删除驾校(逻辑删除)
+     * @param inscodes
+     * @return
+     */
+    boolean updateByInscode(String[] inscodes);
 }

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

@@ -5,11 +5,14 @@ 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.school.domain.SchoolClassType;
+import com.miaxis.school.dto.SchoolClassTypePcDTO;
 import com.miaxis.school.mapper.SchoolClassTypeMapper;
 import com.miaxis.school.service.ISchoolClassTypeService;
+import com.miaxis.school.vo.SchoolClassTypePcVO;
 import org.springframework.stereotype.Service;
 import org.apache.commons.lang3.StringUtils;
 
+import javax.annotation.Resource;
 import java.util.List;
 
 
@@ -22,60 +25,14 @@ import java.util.List;
 @Service
 public class SchoolClassTypeServiceImpl extends ServiceImpl<SchoolClassTypeMapper, SchoolClassType> implements ISchoolClassTypeService {
 
+    @Resource
+    private SchoolClassTypeMapper schoolClassTypeMapper;
+
     /**
-     * 班型查询列表
+     * pc班型查询列表
      */
     @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);
+    public List<SchoolClassTypePcVO> queryList(SchoolClassTypePcDTO schoolClassTypePcDTO) {
+        return schoolClassTypeMapper.queryList(schoolClassTypePcDTO);
     }
 }

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

@@ -1,18 +1,24 @@
 package com.miaxis.school.service.impl;
 
+import java.util.Arrays;
 import java.util.List;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.miaxis.school.dto.SchoolInfoDTO;
 import com.miaxis.school.dto.SchoolInfoEvalDTO;
-import com.miaxis.school.dto.SchoolInfoEvalVO;
-import com.miaxis.school.dto.SchoolInfoVO;
+import com.miaxis.school.dto.SchoolInfoPcDTO;
+import com.miaxis.school.vo.SchoolInfoDetailPcVO;
+import com.miaxis.school.vo.SchoolInfoEvalVO;
+import com.miaxis.school.vo.SchoolInfoPcVO;
+import com.miaxis.school.vo.SchoolInfoVO;
 import com.miaxis.common.utils.DateUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.miaxis.school.mapper.SchoolInfoMapper;
 import com.miaxis.school.domain.SchoolInfo;
 import com.miaxis.school.service.ISchoolInfoService;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
 
 /**
  * 驾校Service业务层处理
@@ -22,7 +28,8 @@ import com.miaxis.school.service.ISchoolInfoService;
  */
 @Service
 public class SchoolInfoServiceImpl extends ServiceImpl<SchoolInfoMapper, SchoolInfo> implements ISchoolInfoService {
-    @Autowired
+
+    @Resource
     private SchoolInfoMapper schoolInfoMapper;
 
     /**
@@ -116,4 +123,41 @@ public class SchoolInfoServiceImpl extends ServiceImpl<SchoolInfoMapper, SchoolI
     public int deleteSchoolInfoById(String inscode){
         return schoolInfoMapper.deleteSchoolInfoById(inscode);
     }
+
+    /**
+     * pc查询列表
+     */
+    @Override
+    public List<SchoolInfoPcVO> queryList(SchoolInfoPcDTO schoolInfoPcDTO) {
+
+        return schoolInfoMapper.queryList(schoolInfoPcDTO);
+    }
+
+    /**
+     * pc查询驾校详情
+     * @param inscode
+     * @return
+     */
+    @Override
+    public SchoolInfoDetailPcVO getSchoolInfoDetail(String inscode) {
+        return schoolInfoMapper.getSchoolInfoDetail(inscode);
+    }
+
+    /**
+     * pc删除驾校(逻辑删除)
+     * @param inscodes
+     * @return
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public boolean updateByInscode(String[] inscodes) {
+        try {
+            schoolInfoMapper.updateByInscode(inscodes);
+            return true;
+        }catch (Exception e){
+            throw new RuntimeException(e);
+        }
+    }
+
+
 }

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

@@ -0,0 +1,44 @@
+package com.miaxis.school.vo;
+
+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;
+
+/**
+ * pc驾校班型返回对象
+ *
+ * @author WWL
+ * @date 2020-1-18
+ */
+@Data
+@ApiModel(value = "SchoolClassType", description = "pc驾校班型返回对象")
+public class SchoolClassTypePcVO extends BaseBusinessEntity{
+
+    /** $column.columnComment */
+    @ApiModelProperty(value = "$column.columnComment")
+    private Long id;
+
+    /** 班级名称 */
+    @ApiModelProperty(value = "班级名称")
+    private String className;
+
+    /** 总价 */
+    @ApiModelProperty(value = "总价")
+    private Long totalPrice;
+
+    /** 学时 */
+    @Excel(name = "学时")
+    @ApiModelProperty(value = "学时")
+    private Long train;
+
+    /** 车型 */
+    @ApiModelProperty(value = "车型")
+    private String pxcx;
+
+    /** 收费方式 1:一次性 2:先学后付 3:计时收费 */
+    @ApiModelProperty(value = "收费方式 1:一次性 2:先学后付 3:计时收费")
+    private String payType;
+
+}

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

@@ -0,0 +1,200 @@
+package com.miaxis.school.vo;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+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-18
+ */
+@Data
+@ApiModel(value = "SchoolInfoPcVO", description = "pc驾校详情返回对象")
+public class SchoolInfoDetailPcVO{
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 驾校全国统一编号
+     */
+    @TableId(value = "inscode")
+    @ApiModelProperty(value = "驾校全国统一编号")
+    private String inscode;
+
+    /**
+     * 驾校名称
+     */
+    @TableField("name")
+    @ApiModelProperty(value = "驾校名称")
+    private String name;
+
+    /**
+     * 驾校简称
+     */
+    @TableField("sname")
+    @ApiModelProperty(value = "驾校简称")
+    private String sname;
+
+    /**
+     * 驾校地址
+     */
+    @TableField("address")
+    @ApiModelProperty(value = "驾校地址")
+    private String address;
+
+    /**
+     * 法人代表证件号码
+     */
+    @TableField("legal_person_id_number")
+    @ApiModelProperty(value = "法人代表证件号码")
+    private String legalPersonIdNumber;
+
+    /**
+     * 经营负责人
+     */
+    @TableField("responsible_person")
+    @ApiModelProperty(value = "经营负责人")
+    private String responsiblePerson;
+
+    /**
+     * 法人代表
+     */
+    @TableField("legal_person_name")
+    @ApiModelProperty(value = "法人代表")
+    private String legalPersonName;
+
+    /**
+     * 行政区划名称
+     */
+    @TableField("area_name")
+    @ApiModelProperty(value = "行政区划名称")
+    private String areaName;
+
+
+    /**
+     * 驾校电话
+     */
+    @TableField("tel")
+    @ApiModelProperty(value = "驾校电话")
+    private String tel;
+
+    /**
+     * 驾校微信号
+     */
+    @TableField("wechar")
+    @ApiModelProperty(value = "驾校微信号")
+    private String wechar;
+
+    /**
+     * 注册日期
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @TableField("registration_date")
+    @ApiModelProperty(value = "注册日期")
+    private Date registrationDate;
+
+    /**
+     * 经营许可证号
+     */
+    @TableField("license_number")
+    @ApiModelProperty(value = "经营许可证号")
+    private String licenseNumber;
+
+    /**
+     * 经营许可证字
+     */
+    @TableField("license_word")
+    @ApiModelProperty(value = "经营许可证字")
+    private String licenseWord;
+
+    /**
+     * 有效期起
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @TableField("license_valid_period_from")
+    @ApiModelProperty(value = "有效期起")
+    private Date licenseValidPeriodFrom;
+
+    /**
+     * 有效期止
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @TableField("license_valid_period_end")
+    @ApiModelProperty(value = "有效期止")
+    private Date licenseValidPeriodEnd;
+
+    /**
+     * 上年度信用等级
+     */
+    @TableField("credibility_grade")
+    @ApiModelProperty(value = "上年度信用等级")
+    private String credibilityGrade;
+
+    /**
+     * 当前信用得分
+     */
+    @TableField("credibility_score")
+    @ApiModelProperty(value = "当前信用得分")
+    private String credibilityScore;
+
+    /**
+     * 业户车辆总数
+     */
+    @TableField("vehicle_sum")
+    @ApiModelProperty(value = "业户车辆总数")
+    private Long vehicleSum;
+
+    /**
+     * 注册资金（单位:万元）
+     */
+    @TableField("regcapital")
+    @ApiModelProperty(value = "注册资金（单位:万元）")
+    private Long regcapital;
+
+    /**
+     * 工商执照号
+     */
+    @TableField("bizlicense")
+    @ApiModelProperty(value = "工商执照号")
+    private String bizlicense;
+
+
+    /**
+     * 逻辑删除标识（1：是；0：否）
+     */
+    @TableField("removed")
+    @ApiModelProperty(value = "逻辑删除标识（1：是；0：否）")
+    private Long removed;
+
+    /**
+     * 初次领证日期
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @TableField("initial_receipt_date")
+    @ApiModelProperty(value = "初次领证日期")
+    private Date initialReceiptDate;
+
+    /**
+     * 业户经营状态
+     */
+    @TableField("business_status_name")
+    @ApiModelProperty(value = "业户经营状态")
+    private String businessStatusName;
+
+    /**
+     * 培训车型
+     */
+    @TableField("pxcx")
+    @ApiModelProperty(value = "培训车型")
+    private String pxcx;
+
+
+
+
+}

hzgzpt-service/src/main/java/com/miaxis/school/dto/SchoolInfoEvalVO.java → hzgzpt-service/src/main/java/com/miaxis/school/vo/SchoolInfoEvalVO.java

@@ -1,4 +1,4 @@
-package com.miaxis.school.dto;
+package com.miaxis.school.vo;
 
 import com.miaxis.common.core.domain.BaseBusinessEntity;
 import io.swagger.annotations.ApiModel;

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

@@ -0,0 +1,99 @@
+package com.miaxis.school.vo;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+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-18
+ */
+@Data
+@ApiModel(value = "SchoolInfoPcVO", description = "pc驾校返回对象")
+public class SchoolInfoPcVO {
+
+    /**
+     * 驾校全国统一编号
+     */
+    @TableId(value = "inscode")
+    @ApiModelProperty(value = "驾校全国统一编号")
+    private String inscode;
+
+    /**
+     * 驾校名称
+     */
+    @TableField("name")
+    @ApiModelProperty(value = "驾校名称")
+    private String name;
+
+    /**
+     * 驾校简称
+     */
+    @TableField("sname")
+    @ApiModelProperty(value = "驾校简称")
+    private String sname;
+
+    /**
+     * 驾校地址
+     */
+    @TableField("address")
+    @ApiModelProperty(value = "驾校地址")
+    private String address;
+
+    /**
+     * 经营负责人
+     */
+    @TableField("responsible_person")
+    @ApiModelProperty(value = "经营负责人")
+    private String responsiblePerson;
+
+    /**
+     * 行政区划名称
+     */
+    @TableField("area_name")
+    @ApiModelProperty(value = "行政区划名称")
+    private String areaName;
+
+
+    /**
+     * 驾校电话
+     */
+    @TableField("tel")
+    @ApiModelProperty(value = "驾校电话")
+    private String tel;
+
+
+    /**
+     * 注册日期
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @TableField("registration_date")
+    @ApiModelProperty(value = "注册日期")
+    private Date registrationDate;
+
+    /**
+     * 当前信用得分
+     */
+    @TableField("credibility_score")
+    @ApiModelProperty(value = "当前信用得分")
+    private String credibilityScore;
+
+
+    /**
+     * 逻辑删除标识（1：是；0：否）
+     */
+    @TableField("removed")
+    @ApiModelProperty(value = "逻辑删除标识（1：是；0：否）")
+    private Long removed;
+
+
+
+
+}

hzgzpt-service/src/main/java/com/miaxis/school/dto/SchoolInfoVO.java → hzgzpt-service/src/main/java/com/miaxis/school/vo/SchoolInfoVO.java

@@ -1,4 +1,4 @@
-package com.miaxis.school.dto;
+package com.miaxis.school.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.miaxis.common.core.domain.BaseBusinessEntity;

hzgzpt-service/src/main/java/com/miaxis/school/dto/SchoolRegionVO.java → hzgzpt-service/src/main/java/com/miaxis/school/vo/SchoolRegionVO.java

@@ -1,4 +1,4 @@
-package com.miaxis.school.dto;
+package com.miaxis.school.vo;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.miaxis.common.core.domain.BaseBusinessEntity;

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

@@ -154,4 +154,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </foreach>
     </delete>
 
+    <select id="queryList" resultType="com.miaxis.coach.vo.CoachInfoPcVO">
+        SELECT
+        ci.`coachnum`,
+        ci.`name`,
+        (CASE WHEN ci.sex = '1' THEN '男' WHEN ci.sex = '2' THEN '女' ELSE '未知' END ) AS sex,
+        ci.`inscode`,
+        ci.`idcard`,
+        ci.`mobile`
+        FROM
+        coach_info ci
+        <where>
+            <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>
+        </where>
+    </select>
+
+
 </mapper>

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

@@ -25,4 +25,30 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateTime"    column="update_time"    />
     </resultMap>
 
+
+    <!--pc班型查询列表-->
+    <select id="queryList" resultType="com.miaxis.school.vo.SchoolClassTypePcVO">
+        SELECT
+        s.`id`,
+        s.`class_name` as className,
+        s.`total_price` as totalPrice,
+        s.`train`,
+        s.`pxcx`,
+        (CASE
+          WHEN s.pay_type = '1' THEN '一次性'
+          WHEN s.pay_type = '2' THEN '先学后付'
+          WHEN s.pay_type = '3' THEN '计时收费'
+          ELSE '未知' END ) AS payType,
+        s.`create_time` as createTime
+        FROM
+        school_class_type s
+        <where>
+            <if test="className != null  and className != ''"> and s.`class_name` like concat('%', #{className}, '%')</if>
+            <if test="totalPrice != null  and totalPrice != ''"> and s.total_price = #{totalPrice}</if>
+            <if test="train != null  and train != ''"> and s.train = #{train}</if>
+            <if test="payType != null  and payType != ''"> and s.pay_type = #{payType}</if>
+            <if test="pxcx != null  and pxcx != ''"> and s.pxcx = #{pxcx}</if>
+        </where>
+    </select>
+
 </mapper>

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

@@ -37,7 +37,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="yzCode"    column="yzCode"    />
     </resultMap>
 
-    <select id="selectSchoolInfoUrlList" parameterType="com.miaxis.school.dto.SchoolInfoDTO" resultType="com.miaxis.school.dto.SchoolInfoVO">
+    <select id="selectSchoolInfoUrlList" parameterType="com.miaxis.school.dto.SchoolInfoDTO" resultType="com.miaxis.school.vo.SchoolInfoVO">
         SELECT s.*,(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 school_info s
         LEFT JOIN (SELECT * FROM school_images i WHERE i.is_top = 1) i
         ON s.inscode = i.inscode
@@ -55,7 +55,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
 
-    <select id="selectSchoolInfoEvalList" parameterType="com.miaxis.school.dto.SchoolInfoEvalDTO" resultType="com.miaxis.school.dto.SchoolInfoEvalVO">
+    <select id="selectSchoolInfoEvalList" parameterType="com.miaxis.school.dto.SchoolInfoEvalDTO" resultType="com.miaxis.school.vo.SchoolInfoEvalVO">
         SELECT s.inscode,s.name,m.stars,m.total
         FROM school_info s
         left join (SELECT inscode,avg(e.total_starts) as stars,count(1) as total FROM school_evaluate e GROUP BY inscode) m
@@ -227,4 +227,83 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </foreach>
     </delete>
 
+
+    <!-- pc驾校列表查询 -->
+    <select id="queryList" resultType="com.miaxis.school.vo.SchoolInfoPcVO">
+        SELECT
+        s.`inscode`,
+        s.`name`,
+        s.`sname`,
+        s.`address`,
+        s.`responsible_person` as responsiblePerson,
+        s.`area_name` as areaName,
+        s.`tel`,
+        s.`registration_date` as registrationDate,
+        s.`credibility_score` as credibilityScore,
+        s.`create_time` as createTime
+        FROM
+        school_info s
+        <where>
+            <if test="inscode != null  and inscode != ''"> and s.inscode = #{inscode}</if>
+            <if test="name != null  and name != ''"> and s.`name` like concat('%', #{name}, '%')</if>
+            <if test="address != null  and address != ''"> and s.address = #{address}</if>
+            <if test="removed != null  and removed != ''"> and s.removed = #{removed}</if>
+            <if test="areaName != null  and areaName != ''"> and s.area_name = #{areaName}</if>
+            <if test="tel != null  and tel != ''"> and s.tel = #{tel}</if>
+            <if test="credibilityScore != null  and credibilityScore != ''"> and s.credibility_score = #{credibilityScore}</if>
+            <if test="startTime neq null and startTime neq '' ">
+                and DATE_FORMAT(s.create_time,'%Y-%m-%d') &gt;= #{startTime}
+            </if>
+            <if test="endTime neq null and endTime neq '' ">
+                and DATE_FORMAT(s.create_time,'%Y-%m-%d') &lt;= #{endTime}
+            </if>
+        </where>
+
+    </select>
+
+
+    <!-- pc查询驾校详情 -->
+    <select id="getSchoolInfoDetail" resultType="com.miaxis.school.vo.SchoolInfoDetailPcVO">
+        SELECT
+        s.`inscode`,
+        s.`name`,
+        s.`sname`,
+        s.`address`,
+        s.`legal_person_id_number` as legalPersonIdNumber,
+        s.`legal_person_name` as legalPersonName,
+        s.`responsible_person` as responsiblePerson,
+        s.`area_name` as areaName,
+        s.`tel`,
+        s.`wechar`,
+        s.`registration_date` as registrationDate,
+        s.`license_number` as licenseNumber,
+        s.`license_word` as licenseWord,
+        s.`license_valid_period_from` as licenseValidPeriodFrom,
+        s.`license_valid_period_end` as licenseValidPeriodEnd,
+        s.`credibility_grade` as credibilityGrade,
+        s.`credibility_score` as credibilityScore,
+        s.`vehicle_sum` as vehicleSum,
+        s.`regcapital`,
+        s.`bizlicense`,
+        s.`removed`,
+        s.`business_status_name` as businessStatusName,
+        s.`create_time` as createTime
+        FROM
+        school_info s
+        where s.`inscode` = #{inscode}
+    </select>
+
+    <!--pc删除驾校(逻辑删除)-->
+    <update id="updateByInscode">
+        UPDATE
+        school_info s
+        SET s.removed = '1'
+        <where>
+            and s.inscode in
+            <foreach collection="inscodes" item="inscode" open="(" close=")" separator=",">
+                (#{inscode})
+            </foreach>
+        </where>
+    </update>
+
 </mapper>