教练密码重置；驾校，教练添加自增主键

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

@@ -22,6 +22,11 @@ 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")
     @ApiModelProperty(value = "教练员全国统一编号")

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

@@ -27,6 +27,11 @@ 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;
+
     /**
      * 驾校全国统一编号
      */

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/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"    />
@@ -47,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,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 from coach_info
     </sql>
 
     <select id="selectCoachInfoList" parameterType="CoachInfo" resultMap="CoachInfoResult">
@@ -156,7 +157,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         SELECT
         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`

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">

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

@@ -34,10 +34,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         s.`address`,
         s.`area`,
         s.`type`,
-        (CASE
-        WHEN s.type = '1' THEN '第二部分'
-        WHEN s.type = '2' THEN '第三部分'
-        ELSE '未知' END ) as type,
         s.`vehicletype`,
         s.`poi_lon` as poiLon,
         s.`poi_lat` as poiLat,