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

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

@@ -117,7 +117,7 @@ public class CoachInfoController extends BaseController{
      * 删除教练
      */
     //@PreAuthorize("@ss.hasPermi('coach:info:remove')")
-    @Log(title = "教练", businessType = BusinessTypeEnum.DELETE)
+    /*@Log(title = "教练", businessType = BusinessTypeEnum.DELETE)
 	@DeleteMapping("/{coachnums}")
     @ApiOperation("删除教练")
     public  Response<Integer> remove(
@@ -125,5 +125,5 @@ public class CoachInfoController extends BaseController{
             @PathVariable String[] coachnums
     ){
         return toResponse(coachInfoService.deleteCoachInfoByIds(coachnums));
-    }
+    }*/
 }

hzgzpt-admin/src/main/java/com/miaxis/app/controller/hospital/HospitalInfoController.java

@@ -97,7 +97,7 @@ public class HospitalInfoController extends BaseController{
      * 删除体检医院
      */
     //@PreAuthorize("@ss.hasPermi('hospital:info:remove')")
-    @Log(title = "体检医院", businessType = BusinessTypeEnum.DELETE)
+    /*@Log(title = "体检医院", businessType = BusinessTypeEnum.DELETE)
 	@DeleteMapping("/{ids}")
     @ApiOperation("删除体检医院")
     public  Response<Integer> remove(
@@ -105,5 +105,5 @@ public class HospitalInfoController extends BaseController{
             @PathVariable Long[] ids
     ){
         return toResponse(hospitalInfoService.deleteHospitalInfoByIds(ids));
-    }
+    }*/
 }

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

@@ -134,7 +134,7 @@ public class SchoolInfoController extends BaseController{
      * 删除驾校
      */
     //@PreAuthorize("@ss.hasPermi('school:info:remove')")
-    @Log(title = "驾校", businessType = BusinessTypeEnum.DELETE)
+    /*@Log(title = "驾校", businessType = BusinessTypeEnum.DELETE)
 	@DeleteMapping("/{inscodes}")
     @ApiOperation("删除驾校")
     public  Response<Integer> remove(
@@ -142,5 +142,5 @@ public class SchoolInfoController extends BaseController{
             @PathVariable String[] inscodes
     ){
         return toResponse(schoolInfoService.deleteSchoolInfoByIds(inscodes));
-    }
+    }*/
 }

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

@@ -87,12 +87,12 @@ public class SchoolRegionController extends BaseController{
     /**
      * 删除驾校训练场
      */
-    @DeleteMapping("/{ids}")
+    /*@DeleteMapping("/{ids}")
     @ApiOperation("删除驾校训练场")
     public  Response<Integer> remove(
             @ApiParam(name = "ids", value = "驾校训练场ids参数", required = true)
             @PathVariable Long[] ids
     ){
         return toResponse(schoolRegionService.removeByIds(Arrays.asList(ids)) ? 1 : 0);
-    }
+    }*/
 }

hzgzpt-admin/src/main/java/com/miaxis/app/controller/user/UserInfoController.java

@@ -93,14 +93,14 @@ public class UserInfoController extends BaseController{
     /**
      * 删除用户信息
      */
-	@DeleteMapping("/{ids}")
+	/*@DeleteMapping("/{ids}")
     @ApiOperation("删除用户信息")
     public  Response<Integer> remove(
             @ApiParam(name = "ids", value = "用户信息ids参数", required = true)
             @PathVariable Long[] ids
     ){
         return toResponse(userInfoService.deleteUserInfoByIds(ids));
-    }
+    }*/
 
     /**
      * 上传身份证正反面,及人像图片

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

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

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

@@ -83,17 +83,17 @@ public class PcCoachInfoController extends BaseController{
     }
 
     /**
-     * 删除教练
+     * pc删除教练(逻辑删除)
      */
     @PreAuthorize("@ss.hasPermi('coach:info:remove')")
     @Log(title = "教练", businessType = BusinessTypeEnum.DELETE)
-	@DeleteMapping("/{coachnums}")
+	@DeleteMapping("/removeCoach/{ids}")
     @ApiOperation("删除教练")
-    public  Response<Integer> remove(
-            @ApiParam(name = "coachnums", value = "教练ids参数", required = true)
-            @PathVariable String[] coachnums
+    public  Response<Integer> removeCoach(
+            @ApiParam(name = "ids", value = "教练ids", required = true)
+            @PathVariable Long[] ids
     ){
-        return toResponse(coachInfoService.removeByIds(Arrays.asList(coachnums)) ? 1 : 0);
+        return toResponse(coachInfoService.removeCoach(ids) ? 1 : 0);
     }
 
 
@@ -102,13 +102,13 @@ public class PcCoachInfoController extends BaseController{
      */
     @PreAuthorize("@ss.hasPermi('coach:info:resetPassword')")
     @Log(title = "教练", businessType = BusinessTypeEnum.UPDATE)
-    @PostMapping("/resetPassword/{coachnums}")
+    @PutMapping("/resetPassword/{ids}")
     @ApiOperation("pc教练密码重置")
     public  Response<Integer> resetPassword(
-            @ApiParam(name = "coachnums", value = "教练员全国统一编号集合", required = true)
-            @PathVariable String[] coachnums
+            @ApiParam(name = "ids", value = "教练ids", required = true)
+            @PathVariable Long[] ids
     ){
-        return toResponse(coachInfoService.resetPassword(coachnums) ? 1 : 0);
+        return toResponse(coachInfoService.resetPassword(ids) ? 1 : 0);
     }
 
 

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

@@ -86,16 +86,17 @@ public class PcSchoolClassTypeController extends BaseController{
     }
 
     /**
-     * 删除驾校班型
+     * 删除驾校班型(逻辑删除)
      */
     @PreAuthorize("@ss.hasPermi('school:class:type:remove')")
     @Log(title = "驾校班型", businessType = BusinessTypeEnum.DELETE)
-	@DeleteMapping("/{ids}")
+	@DeleteMapping("/removeSchoolClassType/{ids}")
     @ApiOperation("删除驾校班型")
-    public  Response<Integer> remove(
+    public  Response<Integer> removeSchoolClassType(
             @ApiParam(name = "ids", value = "驾校班型ids参数", required = true)
             @PathVariable Long[] ids
     ){
-        return toResponse(schoolClassTypeService.removeByIds(Arrays.asList(ids)) ? 1 : 0);
+        return toResponse(schoolClassTypeService.removeSchoolClassType(ids) ? 1 : 0);
     }
+
 }

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

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

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

@@ -18,14 +18,14 @@ import java.util.Arrays;
 import java.util.List;
 
 /**
- * 【场地管理】Controller
+ * 【pc场地管理】Controller
  *
  * @author wwl
  * @date 2021-01-19
  */
 @RestController
 @RequestMapping("/school/region")
-@Api(tags={"【app-场地管理】"})
+@Api(tags={"【pc-场地管理】"})
 public class PcSchoolRegionController extends BaseController{
     @Autowired
     private ISchoolRegionService schoolRegionService;
@@ -83,17 +83,18 @@ public class PcSchoolRegionController extends BaseController{
     }
 
     /**
-     * 删除场地管理
+     * 删除场地管理（逻辑删除）
+     *
      */
     @PreAuthorize("@ss.hasPermi('school:region:remove')")
     @Log(title = "场地管理", businessType = BusinessTypeEnum.DELETE)
-	@DeleteMapping("/{ids}")
+	@DeleteMapping("/removeSchoolRegion/{ids}")
     @ApiOperation("删除场地管理")
-    public  Response<Integer> remove(
+    public  Response<Integer> removeSchoolRegion(
             @ApiParam(name = "ids", value
                     = "场地管理ids参数", required = true)
             @PathVariable Long[] ids
     ){
-        return toResponse(schoolRegionService.removeByIds(Arrays.asList(ids)) ? 1 : 0);
+        return toResponse(schoolRegionService.removeSchoolRegion(ids) ? 1 : 0);
     }
 }

hzgzpt-common/src/main/java/com/miaxis/common/core/domain/entity/UserInfo.java

@@ -119,7 +119,7 @@ public class UserInfo extends BaseBusinessEntity{
     @Excel(name = "0 启用 1禁用")
     @TableField("status")
     @ApiModelProperty(value = "0 启用 1禁用")
-    private Integer status;
+    private String status;
 
     /** 全国平台照片ID */
     @Excel(name = "全国平台照片ID")

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

@@ -77,6 +77,6 @@ public class CoachEvaluate extends BaseBusinessEntity {
     @Excel(name = "状态   0：启用 1：禁用")
     @TableField("status")
     @ApiModelProperty(value = "状态   0：启用 1：禁用")
-    private Integer status;
+    private String status;
 
 }

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

@@ -35,6 +35,6 @@ public class CoachEvaluateLabel extends BaseBusinessEntity {
     @Excel(name = "0 启用 1禁用")
     @TableField("status")
     @ApiModelProperty(value = "0 启用 1禁用")
-    private Integer status;
+    private String status;
 
 }

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

@@ -127,4 +127,10 @@ public class CoachInfo extends BaseBusinessEntity {
     @ApiModelProperty(value = "登录密码 MD5加密")
     private String password;
 
+    /** 状态   0：启用 1：禁用 */
+    @Excel(name = "状态   0：启用 1：禁用")
+    @TableField("status")
+    @ApiModelProperty(value = "状态   0：启用 1：禁用")
+    private String status;
+
 }

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

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

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

@@ -1,5 +1,7 @@
 package com.miaxis.coach.dto;
 
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.miaxis.common.annotation.Excel;
 import com.miaxis.common.core.domain.BaseBusinessEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -40,6 +42,8 @@ public class CoachInfoPcDTO extends BaseBusinessEntity {
     @ApiModelProperty(value = "准驾车型")
     private String dripermitted;
 
+    @ApiModelProperty(value = "状态   0：启用 1：禁用")
+    private String status;
 
 
 }

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

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

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

@@ -72,8 +72,14 @@ public interface CoachInfoMapper extends BaseMapper<CoachInfo> {
 
     /**
      * pc教练密码重置
-     * @param coachnums
+     * @param ids
      * @param password
      */
-    void resetPassword(@Param("coachnums")String[] coachnums, @Param("password")String password);
+    void resetPassword(@Param("ids")Long[] ids, @Param("password")String password);
+
+    /**
+     * pc删除教练（逻辑删除）
+     * @param ids
+     */
+    void removeCoach(@Param("ids")Long[] ids);
 }

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

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

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

@@ -70,8 +70,15 @@ public interface ICoachInfoService extends IService<CoachInfo>{
 
     /**
      * pc教练密码重置
-     * @param coachnums
+     * @param ids
      * @return
      */
-    boolean resetPassword(String[] coachnums);
+    boolean resetPassword(Long[] ids);
+
+    /**
+     * pc删除教练（逻辑删除）
+     * @param ids
+     * @return
+     */
+    boolean removeCoach(Long[] ids);
 }

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

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

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

@@ -103,15 +103,31 @@ public class CoachInfoServiceImpl extends ServiceImpl<CoachInfoMapper, CoachInfo
 
     /**
      * pc教练密码重置
-     * @param coachnums
+     * @param ids
      * @return
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public boolean resetPassword(String[] coachnums) {
+    public boolean resetPassword(Long[] ids) {
         try {
             String password = SecurityUtils.encryptPassword("123456");
-            coachInfoMapper.resetPassword(coachnums, password);
+            coachInfoMapper.resetPassword(ids, password);
+            return true;
+        }catch (Exception e){
+            throw new RuntimeException(e);
+        }
+    }
+
+    /**
+     * pc删除教练（逻辑删除）
+     * @param ids
+     * @return
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public boolean removeCoach(Long[] ids) {
+        try {
+            coachInfoMapper.removeCoach(ids);
             return true;
         }catch (Exception e){
             throw new RuntimeException(e);

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

@@ -0,0 +1,54 @@
+package com.miaxis.coach.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.miaxis.common.core.domain.BaseBusinessEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * pc教练评价对象
+ *
+ * @author wwl
+ * @date 2020-1-21
+ */
+@Data
+@ApiModel(value = "CoachEvaluate", description = "pc教练评价对象")
+public class CoachEvaluatePcVO {
+    private static final long serialVersionUID = 1L;
+
+    /** id */
+    @ApiModelProperty(value = "id")
+    private Long id;
+
+    /** 用户id */
+    @ApiModelProperty(value = "用户id")
+    private Long userId;
+
+    /** 用户名 */
+    @ApiModelProperty(value = "用户名")
+    private String userName;
+
+    /** 用户手机号 */
+    @ApiModelProperty(value = "用户手机号")
+    private String userPhone;
+
+    @ApiModelProperty(value = "评价内容")
+    private String content;
+
+    @ApiModelProperty(value = "总体星级1-5")
+    private Long totelStars;
+
+    @ApiModelProperty(value = "是否匿名：0 :公开  1匿名")
+    private Integer isAnonymous;
+
+    @ApiModelProperty(value = "状态   0：启用 1：禁用")
+    private String status;
+
+    @ApiModelProperty(value = "创建时间"  ,hidden = true)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+
+}

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

@@ -55,5 +55,8 @@ public class CoachInfoPcVO {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date createTime;
 
+    @ApiModelProperty(value = "状态   0：启用 1：禁用")
+    private String status;
+
 
 }

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

@@ -119,6 +119,12 @@ public class SchoolClassType extends BaseBusinessEntity{
     @ApiModelProperty(value = "PDF合同url")
     private String pdfUrl;
 
+    /** 状态   0：启用 1：禁用 */
+    @Excel(name = "状态   0：启用 1：禁用")
+    @TableField("status")
+    @ApiModelProperty(value = "状态   0：启用 1：禁用")
+    private String status;
+
     /** 合同到期时间 */
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "合同到期时间", width = 30, dateFormat = "yyyy-MM-dd")

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

@@ -77,6 +77,6 @@ public class SchoolEvaluate extends BaseBusinessEntity {
     @Excel(name = "status 状态   0：启用 1：禁用")
     @TableField("status")
     @ApiModelProperty(value = "status 状态   0：启用 1：禁用")
-    private Long status;
+    private String status;
 
 }

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

@@ -35,6 +35,6 @@ public class SchoolEvaluateLabel extends BaseBusinessEntity {
     @Excel(name = "0 启用 1禁用")
     @TableField("status")
     @ApiModelProperty(value = "0 启用 1禁用")
-    private Integer status;
+    private String status;
 
 }

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

@@ -224,7 +224,7 @@ public class SchoolInfo extends BaseBusinessEntity {
     @Excel(name = "逻辑删除标识", readConverterExp = "1=：是；0：否")
     @TableField("removed")
     @ApiModelProperty(value = "逻辑删除标识（1：是；0：否）")
-    private Long removed;
+    private String removed;
 
     /**
      * 初次领证日期

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

@@ -126,4 +126,12 @@ public class SchoolRegion extends BaseBusinessEntity{
     @ApiModelProperty(value = "纬度")
     private BigDecimal poiLat;
 
+    /**
+     * 逻辑删除标识（1：是；0：否）
+     */
+    @Excel(name = "逻辑删除标识", readConverterExp = "1=：是；0：否")
+    @TableField("removed")
+    @ApiModelProperty(value = "逻辑删除标识（1：是；0：否）")
+    private String removed;
+
 }

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

@@ -1,5 +1,6 @@
 package com.miaxis.school.dto;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.miaxis.common.annotation.Excel;
 import com.miaxis.common.core.domain.BaseBusinessEntity;
 import io.swagger.annotations.ApiModel;
@@ -37,4 +38,7 @@ public class SchoolClassTypePcDTO extends BaseBusinessEntity {
     @ApiModelProperty(value = "收费方式 1:一次性 2:先学后付 3:计时收费")
     private Integer payType;
 
+    @ApiModelProperty(value = "状态   0：启用 1：禁用")
+    private String status;
+
 }

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

@@ -91,7 +91,7 @@ public class SchoolInfoPcDTO extends BaseBusinessEntity {
      * 逻辑删除标识（1：是；0：否）
      */
     @ApiModelProperty(value = "逻辑删除标识（1：是；0：否）")
-    private Long removed;
+    private String removed;
 
     /**
      * 业户经营状态

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

@@ -5,6 +5,7 @@ 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 org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -22,4 +23,10 @@ public interface SchoolClassTypeMapper extends BaseMapper<SchoolClassType> {
      * @return
      */
     List<SchoolClassTypePcVO> queryList(SchoolClassTypePcDTO schoolClassTypePcDTO);
+
+    /**
+     * 删除驾校班型(逻辑删除)
+     * @param ids
+     */
+    void removeSchoolClassType(@Param("ids")Long[] ids);
 }

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

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

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

@@ -3,6 +3,7 @@ package com.miaxis.school.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.miaxis.school.domain.SchoolRegion;
 import com.miaxis.school.vo.SchoolRegionPcVO;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -20,4 +21,10 @@ public interface SchoolRegionMapper extends BaseMapper<SchoolRegion> {
      * @return
      */
     List<SchoolRegionPcVO> queryRegionList(SchoolRegion schoolRegion);
+
+    /**
+     * 训练场地删除（逻辑删除）
+     * @param ids
+     */
+    void removeSchoolRegion(@Param("ids")Long[] ids);
 }

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

@@ -20,4 +20,10 @@ public interface ISchoolClassTypeService extends IService<SchoolClassType> {
      */
     List<SchoolClassTypePcVO> queryList(SchoolClassTypePcDTO schoolClassTypePcDTO);
 
+    /**
+     * 删除驾校班型(逻辑删除)
+     * @param ids
+     * @return
+     */
+    boolean removeSchoolClassType(Long[] ids);
 }

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

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

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

@@ -25,4 +25,11 @@ public interface ISchoolRegionService extends IService<SchoolRegion>{
      * @return
      */
     List<SchoolRegionPcVO> queryRegionList(SchoolRegion schoolRegion);
+
+    /**
+     * 训练场地删除（逻辑删除）
+     * @param ids
+     * @return
+     */
+    boolean removeSchoolRegion(Long[] ids);
 }

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

@@ -12,6 +12,7 @@ import com.miaxis.school.service.ISchoolClassTypeService;
 import com.miaxis.school.vo.SchoolClassTypePcVO;
 import org.springframework.stereotype.Service;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.util.List;
@@ -37,4 +38,20 @@ public class SchoolClassTypeServiceImpl extends ServiceImpl<SchoolClassTypeMappe
     public List<SchoolClassTypePcVO> queryList(SchoolClassTypePcDTO schoolClassTypePcDTO) {
         return schoolClassTypeMapper.queryList(schoolClassTypePcDTO);
     }
+
+    /**
+     * 删除驾校班型(逻辑删除)
+     * @param ids
+     * @return
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public boolean removeSchoolClassType(Long[] ids) {
+        try {
+            schoolClassTypeMapper.removeSchoolClassType(ids);
+            return true;
+        }catch (Exception e){
+            throw new RuntimeException(e);
+        }
+    }
 }

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

@@ -74,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(0l);
+            schoolEvaluate.setStatus("0");
             schoolEvaluateMapper.insert(schoolEvaluate);
 
             //保存照片

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

@@ -144,14 +144,14 @@ public class SchoolInfoServiceImpl extends ServiceImpl<SchoolInfoMapper, SchoolI
 
     /**
      * pc删除驾校(逻辑删除)
-     * @param inscodes
+     * @param ids
      * @return
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public boolean updateByInscode(String[] inscodes) {
+    public boolean updateByInscode(Long[] ids) {
         try {
-            schoolInfoMapper.updateByInscode(inscodes);
+            schoolInfoMapper.updateByInscode(ids);
             return true;
         }catch (Exception e){
             throw new RuntimeException(e);

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

@@ -3,12 +3,14 @@ package com.miaxis.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.common.annotation.DataScope;
 import com.miaxis.school.domain.SchoolRegion;
 import com.miaxis.school.mapper.SchoolRegionMapper;
 import com.miaxis.school.service.ISchoolRegionService;
 import com.miaxis.school.vo.SchoolRegionPcVO;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.util.List;
@@ -85,7 +87,24 @@ public class SchoolRegionServiceImpl extends ServiceImpl<SchoolRegionMapper, Sch
      * @return
      */
     @Override
+    @DataScope(deptAlias ="s")
     public List<SchoolRegionPcVO> queryRegionList(SchoolRegion schoolRegion) {
         return schoolRegionMapper.queryRegionList(schoolRegion);
     }
+
+    /**
+     * 训练场地删除（逻辑删除）
+     * @param ids
+     * @return
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public boolean removeSchoolRegion(Long[] ids) {
+        try {
+            schoolRegionMapper.removeSchoolRegion(ids);
+            return true;
+        }catch (Exception e){
+            throw new RuntimeException(e);
+        }
+    }
 }

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

@@ -1,5 +1,6 @@
 package com.miaxis.school.vo;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.miaxis.common.annotation.Excel;
 import com.miaxis.common.core.domain.BaseBusinessEntity;
 import io.swagger.annotations.ApiModel;
@@ -41,4 +42,7 @@ public class SchoolClassTypePcVO extends BaseBusinessEntity{
     @ApiModelProperty(value = "收费方式")
     private String payType;
 
+    @ApiModelProperty(value = "状态   0：启用 1：禁用")
+    private String status;
+
 }

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

@@ -18,179 +18,80 @@ import java.util.Date;
 @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;
+    private String 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/vo/SchoolRegionPcVO.java

@@ -22,55 +22,38 @@ import java.util.Date;
 @Data
 @ApiModel(value = "SchoolRegion", description = "pc驾校训练场对象")
 public class SchoolRegionPcVO extends BaseBusinessEntity{
-    private static final long serialVersionUID = 1L;
 
-    /** 主键id */
     @ApiModelProperty(value = "主键id")
     private Long id;
 
-    /** 驾校全国统一编号 */
     @ApiModelProperty(value = "驾校全国统一编号")
     private String inscode;
 
-
-    /** 教学区域名称 */
     @ApiModelProperty(value = "教学区域名称")
     private String name;
 
-    /** 教学区域地址 */
     @ApiModelProperty(value = "教学区域地址")
     private String address;
 
-    /** 教学区域面积 */
     @ApiModelProperty(value = "教学区域面积")
     private Long area;
 
-    /** 教学区域类型 1：第二部分；2：第三部分 */
     @ApiModelProperty(value = "教学区域类型 1：第二部分；2：第三部分")
     private Long type;
 
-    /** 培训车型 */
     @ApiModelProperty(value = "培训车型")
     private String vehicletype;
 
-
-    /** 审核状态： 0：待审核 1：同意启用 2：不同意启用 */
-    @Excel(name = "审核状态： 0：待审核 1：同意启用 2：不同意启用")
-    @TableField("flag")
     @ApiModelProperty(value = "审核状态： 0：待审核 1：同意启用 2：不同意启用")
     private Long flag;
 
-
-    /** 经度 */
-    @Excel(name = "经度")
-    @TableField("poi_lon")
     @ApiModelProperty(value = "经度")
     private BigDecimal poiLon;
 
-    /** 纬度 */
-    @Excel(name = "纬度")
-    @TableField("poi_lat")
     @ApiModelProperty(value = "纬度")
     private BigDecimal poiLat;
 
+    @ApiModelProperty(value = "逻辑删除标识（1：是；0：否）")
+    private String removed;
+
 }

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

@@ -23,5 +23,26 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select id, user_id, coachnum, attitude_stars, area_stars, totel_stars, content, label_ids, create_time, is_anonymous, update_time, status from coach_evaluate
     </sql>
 
+    <select id="queryList" resultType="com.miaxis.coach.vo.CoachEvaluatePcVO">
+        SELECT
+        ce.`id`,
+        ce.`user_id` as userId,
+        ce.`coachnum`,
+        ce.`totel_stars` as totelStars,
+        ce.`content`,
+        ce.`is_anonymous` as isAnonymous,
+        ce.`create_time`,
+        u.`name` as userName,
+        u.`phone` as userPhone
+        FROM
+        coach_evaluate ce
+        join user_info u on u.id = ce.`user_id`
+        join coach_info ci on ci.coachnum = ce.coachnum
+        join school_info s on s.inscode = ci.inscode
+
+        <!-- 数据范围过滤 -->
+        ${params.dataScope}
+    </select>
+
 
 </mapper>

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

@@ -25,6 +25,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateTime"    column="update_time"    />
         <result property="fabulous"    column="fabulous"    />
         <result property="password"    column="password"    />
+        <result property="status"    column="status"    />
     </resultMap>
 
     <select id="selectCoachInfoUrlList" parameterType="com.miaxis.coach.dto.CoachInfoDTO" resultType="com.miaxis.coach.dto.CoachInfoVO">
@@ -48,7 +49,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 
     <sql id="selectCoachInfoVo">
-        select id,coachnum, name, sex, inscode, idcard, mobile, address, photo, dripermitted, teachpermitted, district, employstatus, stop_train, wechar, openid, create_time, update_time, fabulous,password from coach_info
+        select id,coachnum, name, sex, inscode, idcard, mobile, address, photo, dripermitted, teachpermitted, district, employstatus, stop_train, wechar, openid, create_time, update_time, fabulous,password,status from coach_info
     </sql>
 
     <select id="selectCoachInfoList" parameterType="CoachInfo" resultMap="CoachInfoResult">
@@ -161,11 +162,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         ci.`sex`,
         ci.`inscode`,
         ci.`idcard`,
+        ci.`status`,
         ci.`mobile`
         FROM
         coach_info ci
         join school_info d on ci.inscode= d.inscode
         <where>
+            <if test="status == null"> and ci.`status` = '0'</if>
+            <if test="status == '2'.toString()"> and exists(SELECT `status` FROM `coach_info`) </if>
+            <if test="status != null  and status != '' and status != '2'.toString()"> and ci.`status` = #{status}</if>
             <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>
@@ -180,9 +185,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         coach_info ci
         SET password = #{password}
         <where>
-            and ci.coachnum in
-            <foreach collection="coachnums" item="coachnum" open="(" close=")" separator=",">
-                (#{coachnum})
+            and ci.id in
+            <foreach collection="ids" item="id" open="(" close=")" separator=",">
+                (#{id})
+            </foreach>
+        </where>
+    </update>
+
+    <!--pc删除教练(逻辑删除)-->
+    <update id="removeCoach">
+        UPDATE
+        coach_info ci
+        SET ci.status = '1'
+        <where>
+            and ci.id in
+            <foreach collection="ids" item="id" open="(" close=")" separator=",">
+                (#{id})
             </foreach>
         </where>
     </update>

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

@@ -35,12 +35,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         sc.`total_price` as totalPrice,
         sc.`train`,
         sc.`pxcx`,
+        sc.`status`,
         sc.`pay_type` AS payType,
         sc.`create_time` as createTime
         FROM
         school_class_type sc
         JOIN school_info s ON s.inscode = sc.inscode
         <where>
+            <if test="status == null"> and sc.`status` = '0'</if>
+            <if test="status == '2'.toString()"> and exists(SELECT `status` FROM `coach_info`) </if>
+            <if test="status != null  and status != '' and status != '2'.toString()"> and sc.`status` = #{status}</if>
             <if test="className != null  and className != ''"> and sc.`class_name` like concat('%', #{className}, '%')</if>
             <if test="totalPrice != null  and totalPrice != ''"> and sc.total_price = #{totalPrice}</if>
             <if test="train != null  and train != ''"> and sc.train = #{train}</if>
@@ -51,4 +55,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         ${params.dataScope}
     </select>
 
+    <!--删除驾校班型(逻辑删除)-->
+    <update id="removeSchoolClassType">
+        UPDATE
+        school_class_type s
+        SET s.status = '1'
+        <where>
+            and s.id in
+            <foreach collection="ids" item="id" open="(" close=")" separator=",">
+                (#{id})
+            </foreach>
+        </where>
+    </update>
+
 </mapper>

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

@@ -240,17 +240,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         s.`responsible_person` as responsiblePerson,
         s.`area_name` as areaName,
         s.`tel`,
+        s.`removed`,
         s.`registration_date` as registrationDate,
         s.`credibility_score` as credibilityScore,
         s.`create_time` as createTime
         FROM
         school_info s
         <where>
+            <if test="removed == null"> and s.`removed` = '0'</if>
+            <if test="removed == '2'.toString()"> and exists(SELECT `removed` FROM `school_info`) </if>
+            <if test="removed != null  and removed != '' and removed != '2'.toString()"> and s.`removed` = #{removed}</if>
             <if test="id != null  and id != ''"> and s.id = #{id}</if>
             <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>
@@ -302,9 +305,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         school_info s
         SET s.removed = '1'
         <where>
-            and s.inscode in
-            <foreach collection="inscodes" item="inscode" open="(" close=")" separator=",">
-                (#{inscode})
+            and s.id in
+            <foreach collection="ids" item="id" open="(" close=")" separator=",">
+                (#{id})
             </foreach>
         </where>
     </update>

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

@@ -22,26 +22,52 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="areaCode"    column="area_code"    />
         <result property="poiLon"    column="poi_lon"    />
         <result property="poiLat"    column="poi_lat"    />
+        <result property="removed"    column="removed"    />
         <result property="createTime"    column="create_time"    />
         <result property="updateTime"    column="update_time"    />
     </resultMap>
 
 
-    <select id="queryRegionList" resultType="com.miaxis.school.domain.SchoolRegion">
+    <select id="queryRegionList" resultType="com.miaxis.school.vo.SchoolRegionPcVO">
         SELECT
-        s.`id`,
-        s.`name`,
-        s.`address`,
-        s.`area`,
-        s.`type`,
-        s.`vehicletype`,
-        s.`poi_lon` as poiLon,
-        s.`poi_lat` as poiLat,
-        s.`flag`,
-        s.`create_time` as createTime
+        sr.`id`,
+        sr.`inscode`,
+        sr.`name`,
+        sr.`address`,
+        sr.`area`,
+        sr.`type`,
+        sr.`vehicletype`,
+        sr.`poi_lon` as poiLon,
+        sr.`poi_lat` as poiLat,
+        sr.`flag`,
+        sr.`removed`,
+        sr.`create_time` as createTime
         FROM
-        school_region s
+        school_region sr
+        join school_info s on s.inscode= sr.inscode
+        <where>
+            <if test="removed == null"> and sr.`removed` = '0'</if>
+            <if test="removed == '2'.toString()"> and exists(SELECT `removed` FROM `school_info`) </if>
+            <if test="removed != null and removed != '' and removed != '2'.toString()"> and sr.`removed` = #{removed}</if>
+            <if test="name != null  and name != ''"> and sr.`name` like concat('%', #{name}, '%')</if>
+        </where>
+
+        <!-- 数据范围过滤 -->
+        ${params.dataScope}
     </select>
 
+    <!--pc删除场地(逻辑删除)-->
+    <update id="removeSchoolRegion">
+        UPDATE
+        school_region s
+        SET s.removed = '1'
+        <where>
+            and s.id in
+            <foreach collection="ids" item="id" open="(" close=")" separator=",">
+                (#{id})
+            </foreach>
+        </where>
+    </update>
+
 
 </mapper>