用户修改

hzgzpt-service-app/src/main/java/com/miaxis/app/user/domain/UserInfo.java

@@ -1,24 +1,22 @@
 package com.miaxis.app.user.domain;
 
-import java.util.Date;
+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.core.domain.BaseBusinessEntity;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 import com.miaxis.common.annotation.Excel;
-import com.miaxis.common.core.domain.BaseEntity;
+import com.miaxis.common.core.domain.BaseBusinessEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
+
+import java.util.Date;
+
 /**
  * 用户信息对象 user_info
  *
  * @author miaxis
- * @date 2020-12-23
+ * @date 2020-12-25
  */
 @Data
 @TableName("user_info")
@@ -99,18 +97,18 @@ public class UserInfo extends BaseBusinessEntity {
     @ApiModelProperty(value = "驾校全国统一编号")
     private String inscode;
 
+    /** 驾校班型Id */
+    @Excel(name = "驾校班型Id")
+    @TableField("school_class_type_id")
+    @ApiModelProperty(value = "驾校班型Id")
+    private Long schoolClassTypeId;
+
     /** 培训车型 */
     @Excel(name = "培训车型")
     @TableField("pxcx")
     @ApiModelProperty(value = "培训车型")
     private String pxcx;
 
-    /** 驾校班型Id */
-    @Excel(name = "驾校班型Id")
-    @TableField("school_class_type_id")
-    @ApiModelProperty(value = "驾校班型Id")
-    private String schoolClassTypeId;
-
     /** 教练全国统一编号 */
     @Excel(name = "教练全国统一编号")
     @TableField("coachnum")
@@ -121,6 +119,7 @@ public class UserInfo extends BaseBusinessEntity {
     @Excel(name = "0 启用 1禁用")
     @TableField("status")
     @ApiModelProperty(value = "0 启用 1禁用")
-    private String status;
+    private Integer status;
+
 
-}
+}

hzgzpt-service-app/src/main/resources/mapper/user/UserInfoMapper.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.miaxis.app.user.mapper.UserInfoMapper">
-    
+
     <resultMap type="UserInfo" id="UserInfoResult">
         <result property="id"    column="id"    />
         <result property="name"    column="name"    />
@@ -18,24 +18,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="openid"    column="openid"    />
         <result property="inscode"    column="inscode"    />
         <result property="createTime"    column="create_time"    />
+        <result property="schoolClassTypeId"    column="school_class_type_id"    />
         <result property="updateTime"    column="update_time"    />
         <result property="pxcx"    column="pxcx"    />
-        <result property="schoolClassTypeId"    column="school_class_type_id"    />
         <result property="coachnum"    column="coachnum"    />
         <result property="status"    column="status"    />
     </resultMap>
 
     <sql id="selectUserInfoVo">
-        select id, name, sex, sfzmlx, idCard, crdate, birthday, mobile, password, wechar, openid, inscode, create_time, update_time, pxcx,schoolClassTypeId,coachId from user_info
+        select id, name, sex, sfzmlx, id_card, crdate, birthday, mobile, password, wechar, openid, inscode, create_time, school_class_type_id, update_time, pxcx, coachnum, status from user_info
     </sql>
 
     <select id="selectUserInfoList" parameterType="UserInfo" resultMap="UserInfoResult">
         <include refid="selectUserInfoVo"/>
-        <where>  
+        <where>
             <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
             <if test="sex != null "> and sex = #{sex}</if>
             <if test="sfzmlx != null "> and sfzmlx = #{sfzmlx}</if>
-            <if test="idCard != null  and idCard != ''"> and idCard = #{idCard}</if>
+            <if test="idCard != null  and idCard != ''"> and id_card = #{idCard}</if>
             <if test="crdate != null "> and crdate = #{crdate}</if>
             <if test="birthday != null "> and birthday = #{birthday}</if>
             <if test="mobile != null  and mobile != ''"> and mobile = #{mobile}</if>
@@ -43,18 +43,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="wechar != null  and wechar != ''"> and wechar = #{wechar}</if>
             <if test="openid != null  and openid != ''"> and openid = #{openid}</if>
             <if test="inscode != null  and inscode != ''"> and inscode = #{inscode}</if>
+            <if test="schoolClassTypeId != null "> and school_class_type_id = #{schoolClassTypeId}</if>
             <if test="pxcx != null  and pxcx != ''"> and pxcx = #{pxcx}</if>
-            <if test="schoolClassTypeId != null">schoolClassTypeId,</if>
-            <if test="coachnum != null">coachnum,</if>
-            <if test="status != null">status,</if>
+            <if test="coachnum != null  and coachnum != ''"> and coachnum = #{coachnum}</if>
+            <if test="status != null "> and status = #{status}</if>
         </where>
     </select>
-    
+
     <select id="selectUserInfoById" parameterType="Long" resultMap="UserInfoResult">
         <include refid="selectUserInfoVo"/>
         where id = #{id}
     </select>
-        
+
     <insert id="insertUserInfo" parameterType="UserInfo">
         insert into user_info
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -62,7 +62,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="name != null">name,</if>
             <if test="sex != null">sex,</if>
             <if test="sfzmlx != null">sfzmlx,</if>
-            <if test="idCard != null">idCard,</if>
+            <if test="idCard != null">id_card,</if>
             <if test="crdate != null">crdate,</if>
             <if test="birthday != null">birthday,</if>
             <if test="mobile != null">mobile,</if>
@@ -71,12 +71,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="openid != null">openid,</if>
             <if test="inscode != null">inscode,</if>
             <if test="createTime != null">create_time,</if>
+            <if test="schoolClassTypeId != null">school_class_type_id,</if>
             <if test="updateTime != null">update_time,</if>
             <if test="pxcx != null">pxcx,</if>
-            <if test="schoolClassTypeId != null">schoolClassTypeId,</if>
             <if test="coachnum != null">coachnum,</if>
             <if test="status != null">status,</if>
-         </trim>
+        </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
             <if test="name != null">#{name},</if>
@@ -91,12 +91,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="openid != null">#{openid},</if>
             <if test="inscode != null">#{inscode},</if>
             <if test="createTime != null">#{createTime},</if>
+            <if test="schoolClassTypeId != null">#{schoolClassTypeId},</if>
             <if test="updateTime != null">#{updateTime},</if>
             <if test="pxcx != null">#{pxcx},</if>
-            <if test="schoolClassTypeId != null">#{schoolClassTypeId},</if>
-            <if test="coachnum != null">coachnum,</if>
-            <if test="status != null">status,</if>
-         </trim>
+            <if test="coachnum != null">#{coachnum},</if>
+            <if test="status != null">#{status},</if>
+        </trim>
     </insert>
 
     <update id="updateUserInfo" parameterType="UserInfo">
@@ -105,7 +105,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="name != null">name = #{name},</if>
             <if test="sex != null">sex = #{sex},</if>
             <if test="sfzmlx != null">sfzmlx = #{sfzmlx},</if>
-            <if test="idCard != null">idCard = #{idCard},</if>
+            <if test="idCard != null">id_card = #{idCard},</if>
             <if test="crdate != null">crdate = #{crdate},</if>
             <if test="birthday != null">birthday = #{birthday},</if>
             <if test="mobile != null">mobile = #{mobile},</if>
@@ -114,11 +114,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="openid != null">openid = #{openid},</if>
             <if test="inscode != null">inscode = #{inscode},</if>
             <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="schoolClassTypeId != null">school_class_type_id = #{schoolClassTypeId},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
             <if test="pxcx != null">pxcx = #{pxcx},</if>
-            <if test="schoolClassTypeId != null">#{schoolClassTypeId},</if>
-            <if test="coachnum != null">coachnum,</if>
-            <if test="status != null">status,</if>
+            <if test="coachnum != null">coachnum = #{coachnum},</if>
+            <if test="status != null">status = #{status},</if>
         </trim>
         where id = #{id}
     </update>
@@ -128,10 +128,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <delete id="deleteUserInfoByIds" parameterType="String">
-        delete from user_info where id in 
+        delete from user_info where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>
     </delete>
-    
+
 </mapper>