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

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

@@ -1,31 +1,21 @@
 package com.miaxis.pc.controller.coach;
 
-import java.util.List;
-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.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.utils.poi.ExcelUtil;
+import com.miaxis.common.enums.BusinessTypeEnum;
 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;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import com.miaxis.common.annotation.Log;
-import com.miaxis.common.core.controller.BaseController;
-import com.miaxis.common.enums.BusinessTypeEnum;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Arrays;
+import java.util.List;
 
 /**
  * 【教练】Controller
@@ -105,4 +95,22 @@ public class PcCoachInfoController extends BaseController{
     ){
         return toResponse(coachInfoService.removeByIds(Arrays.asList(coachnums)) ? 1 : 0);
     }
+
+
+    /**
+     * pc教练密码重置
+     */
+    @PreAuthorize("@ss.hasPermi('coach:info:resetPassword')")
+    @Log(title = "教练", businessType = BusinessTypeEnum.UPDATE)
+    @PostMapping("/resetPassword/{coachnums}")
+    @ApiOperation("pc教练密码重置")
+    public  Response<Integer> resetPassword(
+            @ApiParam(name = "coachnums", value = "教练员全国统一编号集合", required = true)
+            @PathVariable String[] coachnums
+    ){
+        return toResponse(coachInfoService.resetPassword(coachnums) ? 1 : 0);
+    }
+
+
+
 }

hzgzpt-admin/src/main/java/com/miaxis/pc/controller/school/PcSchoolRegionController.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.common.utils.poi.ExcelUtil;
+import com.miaxis.school.domain.SchoolRegion;
+import com.miaxis.school.service.ISchoolRegionService;
+import com.miaxis.school.vo.SchoolRegionPcVO;
+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;
+import java.util.List;
+
+/**
+ * 【场地管理】Controller
+ *
+ * @author wwl
+ * @date 2021-01-19
+ */
+@RestController
+@RequestMapping("/school/region")
+@Api(tags={"【app-场地管理】"})
+public class PcSchoolRegionController extends BaseController{
+    @Autowired
+    private ISchoolRegionService schoolRegionService;
+
+    /**
+     * pc查询场地管理列表
+     */
+    @PreAuthorize("@ss.hasPermi('school:region: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<SchoolRegionPcVO> list(@ModelAttribute SchoolRegion schoolRegion){
+        startPage();
+        List<SchoolRegionPcVO> list = schoolRegionService.queryRegionList(schoolRegion);
+        return toResponsePageInfo(list);
+    }
+
+
+    /**
+     * 获取场地管理详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('school:region:query')")
+    @GetMapping(value = "/{id}")
+    @ApiOperation("获取场地管理详细信息")
+    public Response<SchoolRegion> getInfo(
+            @ApiParam(name = "id", value = "场地管理参数", required = true)
+            @PathVariable("id") Long id
+    ){
+        return Response.success(schoolRegionService.getById(id));
+    }
+
+    /**
+     * 新增场地管理
+     */
+    @PreAuthorize("@ss.hasPermi('school:region:add')")
+    @Log(title = "场地管理", businessType = BusinessTypeEnum.INSERT)
+    @PostMapping
+    @ApiOperation("新增场地管理")
+    public Response<Integer> add(@RequestBody SchoolRegion schoolRegion){
+        return toResponse(schoolRegionService.save(schoolRegion) ? 1 : 0);
+    }
+
+    /**
+     * 修改场地管理
+     */
+    @PreAuthorize("@ss.hasPermi('school:region:edit')")
+    @Log(title = "场地管理", businessType = BusinessTypeEnum.UPDATE)
+    @PutMapping
+    @ApiOperation("修改场地管理")
+    public Response<Integer> edit(@RequestBody SchoolRegion schoolRegion){
+        return toResponse(schoolRegionService.updateById(schoolRegion) ? 1 : 0);
+    }
+
+    /**
+     * 删除场地管理
+     */
+    @PreAuthorize("@ss.hasPermi('school:region:remove')")
+    @Log(title = "场地管理", businessType = BusinessTypeEnum.DELETE)
+	@DeleteMapping("/{ids}")
+    @ApiOperation("删除场地管理")
+    public  Response<Integer> remove(
+            @ApiParam(name = "ids", value
+                    = "场地管理ids参数", required = true)
+            @PathVariable Long[] ids
+    ){
+        return toResponse(schoolRegionService.removeByIds(Arrays.asList(ids)) ? 1 : 0);
+    }
+}

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

@@ -22,8 +22,13 @@ import lombok.Data;
 public class CoachInfo extends BaseBusinessEntity {
     private static final long serialVersionUID = 1L;
 
+    /** $column.columnComment */
+    @TableId(value = "id")
+    @ApiModelProperty(value = "$column.columnComment")
+    private Long id;
+
     /** 教练员全国统一编号 */
-    @TableId(value = "coachnum")
+    @TableField(value = "coachnum")
     @ApiModelProperty(value = "教练员全国统一编号")
     private String coachnum;
 
@@ -116,4 +121,10 @@ public class CoachInfo extends BaseBusinessEntity {
     @ApiModelProperty(value = "点赞数")
     private Long fabulous;
 
+    /** 登录密码 MD5加密 */
+    @Excel(name = "登录密码 MD5加密")
+    @TableField("password")
+    @ApiModelProperty(value = "登录密码 MD5加密")
+    private String password;
+
 }

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

@@ -6,6 +6,7 @@ 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 org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -48,13 +49,6 @@ public interface CoachInfoMapper extends BaseMapper<CoachInfo> {
      */
     public int updateCoachInfo(CoachInfo coachInfo);
 
-    /**
-     * 删除教练
-     *
-     * @param coachnum 教练ID
-     * @return 结果
-     */
-    public int deleteCoachInfoById(String coachnum);
 
     /**
      * 批量删除教练
@@ -75,4 +69,11 @@ public interface CoachInfoMapper extends BaseMapper<CoachInfo> {
      * @return
      */
     List<CoachInfoPcVO> queryList(CoachInfoPcDTO coachInfo);
+
+    /**
+     * pc教练密码重置
+     * @param coachnums
+     * @param password
+     */
+    void resetPassword(@Param("coachnums")String[] coachnums, @Param("password")String password);
 }

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

@@ -55,13 +55,6 @@ public interface ICoachInfoService extends IService<CoachInfo>{
      */
     public int deleteCoachInfoByIds(String[] coachnums);
 
-    /**
-     * 删除教练信息
-     *
-     * @param coachnum 教练ID
-     * @return 结果
-     */
-    public int deleteCoachInfoById(String coachnum);
 
     /**
      * 查询教练信息列表 带头像距离
@@ -75,4 +68,10 @@ public interface ICoachInfoService extends IService<CoachInfo>{
      */
     List<CoachInfoPcVO> queryList(CoachInfoPcDTO coachInfo);
 
+    /**
+     * pc教练密码重置
+     * @param coachnums
+     * @return
+     */
+    boolean resetPassword(String[] coachnums);
 }

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

@@ -10,6 +10,8 @@ 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 com.miaxis.common.utils.SecurityUtils;
+import com.miaxis.common.utils.sign.Md5Utils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -89,17 +91,6 @@ public class CoachInfoServiceImpl extends ServiceImpl<CoachInfoMapper, CoachInfo
         return coachInfoMapper.deleteCoachInfoByIds(coachnums);
     }
 
-    /**
-     * 删除教练信息
-     *
-     * @param coachnum 教练ID
-     * @return 结果
-     */
-    @Override
-    public int deleteCoachInfoById(String coachnum){
-        return coachInfoMapper.deleteCoachInfoById(coachnum);
-    }
-
 
     @Override
     public List<CoachInfoVO> selectCoachInfoUrlList(CoachInfoDTO coachInfoDTO) {
@@ -114,4 +105,21 @@ public class CoachInfoServiceImpl extends ServiceImpl<CoachInfoMapper, CoachInfo
         return coachInfoMapper.queryList(coachInfo);
     }
 
+    /**
+     * pc教练密码重置
+     * @param coachnums
+     * @return
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public boolean resetPassword(String[] coachnums) {
+        try {
+            String password = SecurityUtils.encryptPassword("123456");
+            coachInfoMapper.resetPassword(coachnums, password);
+            return true;
+        }catch (Exception e){
+            throw new RuntimeException(e);
+        }
+    }
+
 }

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

@@ -1,5 +1,6 @@
 package com.miaxis.coach.vo;
 
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -17,6 +18,9 @@ import java.util.Date;
 @ApiModel(value = "CoachInfo", description = "pc教练返回对象")
 public class CoachInfoPcVO {
 
+    @ApiModelProperty(value = "id")
+    private Long id;
+
     /** 教练员全国统一编号 */
     @ApiModelProperty(value = "教练员全国统一编号")
     private String coachnum;

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

@@ -27,10 +27,15 @@ import lombok.Data;
 public class SchoolInfo extends BaseBusinessEntity {
     private static final long serialVersionUID = 1L;
 
+    /** $column.columnComment */
+    @TableId(value = "id")
+    @ApiModelProperty(value = "$column.columnComment")
+    private Long id;
+
     /**
      * 驾校全国统一编号
      */
-    @TableId(value = "inscode")
+    @TableField(value = "inscode")
     @ApiModelProperty(value = "驾校全国统一编号")
     private String inscode;
 

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

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

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

@@ -2,6 +2,9 @@ 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 java.util.List;
 
 /**
  * 驾校训练场Mapper接口
@@ -11,4 +14,10 @@ import com.miaxis.school.domain.SchoolRegion;
  */
 public interface SchoolRegionMapper extends BaseMapper<SchoolRegion> {
 
+    /**
+     * pc查询场地管理列表
+     * @param schoolRegion
+     * @return
+     */
+    List<SchoolRegionPcVO> queryRegionList(SchoolRegion schoolRegion);
 }

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

@@ -2,6 +2,7 @@ package com.miaxis.school.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.miaxis.school.domain.SchoolRegion;
+import com.miaxis.school.vo.SchoolRegionPcVO;
 
 import java.util.List;
 
@@ -17,4 +18,11 @@ public interface ISchoolRegionService extends IService<SchoolRegion>{
      * 查询列表
      */
     List<SchoolRegion> queryList(SchoolRegion schoolRegion);
+
+    /**
+     * pc查询场地管理列表
+     * @param schoolRegion
+     * @return
+     */
+    List<SchoolRegionPcVO> queryRegionList(SchoolRegion schoolRegion);
 }

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

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 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;
 
@@ -77,4 +78,14 @@ public class SchoolRegionServiceImpl extends ServiceImpl<SchoolRegionMapper, Sch
         }
         return this.list(lqw);
     }
+
+    /**
+     * pc查询场地管理列表
+     * @param schoolRegion
+     * @return
+     */
+    @Override
+    public List<SchoolRegionPcVO> queryRegionList(SchoolRegion schoolRegion) {
+        return schoolRegionMapper.queryRegionList(schoolRegion);
+    }
 }

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

@@ -38,7 +38,7 @@ public class SchoolClassTypePcVO extends BaseBusinessEntity{
     private String pxcx;
 
     /** 收费方式 1:一次性 2:先学后付 3:计时收费 */
-    @ApiModelProperty(value = "收费方式 1:一次性 2:先学后付 3:计时收费")
+    @ApiModelProperty(value = "收费方式")
     private String payType;
 
 }

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

@@ -1,7 +1,5 @@
 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;
@@ -19,45 +17,42 @@ import java.util.Date;
 @ApiModel(value = "SchoolInfoPcVO", description = "pc驾校返回对象")
 public class SchoolInfoPcVO {
 
+    @ApiModelProperty(value = "id")
+    private Long id;
+
     /**
      * 驾校全国统一编号
      */
-    @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;
 
@@ -65,7 +60,6 @@ public class SchoolInfoPcVO {
     /**
      * 驾校电话
      */
-    @TableField("tel")
     @ApiModelProperty(value = "驾校电话")
     private String tel;
 
@@ -74,14 +68,12 @@ public class SchoolInfoPcVO {
      * 注册日期
      */
     @JsonFormat(pattern = "yyyy-MM-dd")
-    @TableField("registration_date")
     @ApiModelProperty(value = "注册日期")
     private Date registrationDate;
 
     /**
      * 当前信用得分
      */
-    @TableField("credibility_score")
     @ApiModelProperty(value = "当前信用得分")
     private String credibilityScore;
 
@@ -89,7 +81,6 @@ public class SchoolInfoPcVO {
     /**
      * 逻辑删除标识（1：是；0：否）
      */
-    @TableField("removed")
     @ApiModelProperty(value = "逻辑删除标识（1：是；0：否）")
     private Long removed;
 

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

@@ -0,0 +1,76 @@
+package com.miaxis.school.vo;
+
+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 2021-01-19
+ */
+@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;
+
+}

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

@@ -5,6 +5,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <mapper namespace="com.miaxis.coach.mapper.CoachInfoMapper">
 
     <resultMap type="CoachInfo" id="CoachInfoResult">
+        <result property="id"    column="id"    />
         <result property="coachnum"    column="coachnum"    />
         <result property="name"    column="name"    />
         <result property="sex"    column="sex"    />
@@ -23,6 +24,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="createTime"    column="create_time"    />
         <result property="updateTime"    column="update_time"    />
         <result property="fabulous"    column="fabulous"    />
+        <result property="password"    column="password"    />
     </resultMap>
 
     <select id="selectCoachInfoUrlList" parameterType="com.miaxis.coach.dto.CoachInfoDTO" resultType="com.miaxis.coach.dto.CoachInfoVO">
@@ -46,7 +48,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 
     <sql id="selectCoachInfoVo">
-        select coachnum, name, sex, inscode, idcard, mobile, address, photo, dripermitted, teachpermitted, district, employstatus, stop_train, wechar, openid, create_time, update_time, fabulous 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 from coach_info
     </sql>
 
     <select id="selectCoachInfoList" parameterType="CoachInfo" resultMap="CoachInfoResult">
@@ -143,9 +145,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where coachnum = #{coachnum}
     </update>
 
-    <delete id="deleteCoachInfoById" parameterType="String">
-        delete from coach_info where coachnum = #{coachnum}
-    </delete>
 
     <delete id="deleteCoachInfoByIds" parameterType="String">
         delete from coach_info where coachnum in
@@ -156,9 +155,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="queryList" resultType="com.miaxis.coach.vo.CoachInfoPcVO">
         SELECT
+        ci.`id`,
         ci.`coachnum`,
         ci.`name`,
-        (CASE WHEN ci.sex = '1' THEN '男' WHEN ci.sex = '2' THEN '女' ELSE '未知' END ) AS sex,
+        ci.`sex`,
         ci.`inscode`,
         ci.`idcard`,
         ci.`mobile`
@@ -171,5 +171,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
     </select>
 
+    <!--密码重置-->
+    <update id="resetPassword">
+        UPDATE
+        coach_info ci
+        SET password = #{password}
+        <where>
+            and ci.coachnum in
+            <foreach collection="coachnums" item="coachnum" open="(" close=")" separator=",">
+                (#{coachnum})
+            </foreach>
+        </where>
+    </update>
+
 
 </mapper>

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

@@ -34,11 +34,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         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.`pay_type` AS payType,
         s.`create_time` as createTime
         FROM
         school_class_type s

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

@@ -5,6 +5,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <mapper namespace="com.miaxis.school.mapper.SchoolInfoMapper">
 
     <resultMap type="SchoolInfo" id="SchoolInfoResult">
+        <result property="id"    column="id"    />
         <result property="inscode"    column="inscode"    />
         <result property="name"    column="name"    />
         <result property="sname"    column="sname"    />
@@ -71,7 +72,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 
     <sql id="selectSchoolInfoVo">
-        select inscode, name, sname, address, legal_person_id_number, responsible_person, legal_person_name, area_name, area_code, tel, wechar, registration_date, license_number, license_word, license_valid_period_from, license_valid_period_end, credibility_grade, credibility_score, vehicle_sum, regcapital, bizlicense, poi_lon, poi_lat, removed, create_time, update_time, initial_receipt_date, business_status_name, pxcx, yz_code from school_info
+        select id,inscode, name, sname, address, legal_person_id_number, responsible_person, legal_person_name, area_name, area_code, tel, wechar, registration_date, license_number, license_word, license_valid_period_from, license_valid_period_end, credibility_grade, credibility_score, vehicle_sum, regcapital, bizlicense, poi_lon, poi_lat, removed, create_time, update_time, initial_receipt_date, business_status_name, pxcx, yz_code from school_info
     </sql>
 
     <select id="selectSchoolInfoList" parameterType="SchoolInfo" resultMap="SchoolInfoResult">
@@ -231,6 +232,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <!-- pc驾校列表查询 -->
     <select id="queryList" resultType="com.miaxis.school.vo.SchoolInfoPcVO">
         SELECT
+        s.`id`,
         s.`inscode`,
         s.`name`,
         s.`sname`,

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

@@ -26,4 +26,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateTime"    column="update_time"    />
     </resultMap>
 
+
+    <select id="queryRegionList" resultType="com.miaxis.school.domain.SchoolRegion">
+        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
+        FROM
+        school_region s
+    </select>
+
+
 </mapper>