'修改学员信息'

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

@@ -1,64 +1,65 @@
 package com.miaxis.common.core.domain.entity;
 
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
+import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
+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.BaseBusinessEntity;
+import com.miaxis.common.core.domain.BaseEntity;
 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 com.miaxis.common.core.domain.BaseBusinessEntity;
 import lombok.Data;
-
-import java.util.Date;
-
 /**
- * 用户信息对象 user_info
+ * 用户对象 user_info
  *
  * @author miaxis
- * @date 2020-12-25
+ * @date 2021-01-11
  */
 @Data
 @TableName("user_info")
-@ApiModel(value = "UserInfo", description = "用户信息对象 user_info")
-public class UserInfo extends BaseBusinessEntity {
+@ApiModel(value = "UserInfo", description = "用户对象 user_info")
+public class UserInfo extends BaseBusinessEntity{
     private static final long serialVersionUID = 1L;
 
     /** $column.columnComment */
     @TableId(value = "id")
-    @ApiModelProperty(value = "用户id")
+    @ApiModelProperty(value = "$column.columnComment")
     private Long id;
 
+    /** 驾校全国统一编号 */
+    @Excel(name = "驾校全国统一编号")
+    @TableField("inscode")
+    @ApiModelProperty(value = "驾校全国统一编号")
+    private String inscode;
+
     /** 姓名 */
     @Excel(name = "姓名")
     @TableField("name")
     @ApiModelProperty(value = "姓名")
     private String name;
 
-    /** 性别 */
-    @Excel(name = "性别")
+    /** 性别 1：男性 2：女性 */
+    @Excel(name = "性别 1：男性 2：女性")
     @TableField("sex")
-    @ApiModelProperty(value = "性别")
+    @ApiModelProperty(value = "性别 1：男性 2：女性")
     private Long sex;
 
-    /** 身份证明号码 1：身份证号，2：警官证，3：军官证，4：护照等 */
-    @Excel(name = "身份证明号码 1：身份证号，2：警官证，3：军官证，4：护照等")
-    @TableField("sfzmlx")
-    @ApiModelProperty(value = "身份证明号码 1：身份证号，2：警官证，3：军官证，4：护照等")
-    private Long sfzmlx;
+    /** 身份证明号码 1：身份证号，2：护照，3：军官证，4：其他 */
+    @Excel(name = "身份证明号码 1：身份证号，2：护照，3：军官证，4：其他")
+    @TableField("cardtype")
+    @ApiModelProperty(value = "身份证明号码 1：身份证号，2：护照，3：军官证，4：其他")
+    private Long cardtype;
 
     /** 身份证明号码 */
     @Excel(name = "身份证明号码")
-    @TableField(value ="id_card")
+    @TableField("idcard")
     @ApiModelProperty(value = "身份证明号码")
-    private String idCard;
-
-    /** 注册日期 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "注册日期", width = 30, dateFormat = "yyyy-MM-dd")
-    @TableField("crdate")
-    @ApiModelProperty(value = "注册日期")
-    private Date crdate;
+    private String idcard;
 
     /** 出生日期 */
     @JsonFormat(pattern = "yyyy-MM-dd")
@@ -69,9 +70,9 @@ public class UserInfo extends BaseBusinessEntity {
 
     /** 手机号码 */
     @Excel(name = "手机号码")
-    @TableField("mobile")
+    @TableField("phone")
     @ApiModelProperty(value = "手机号码")
-    private String mobile;
+    private String phone;
 
     /** 登录密码 MD5加密 */
     @Excel(name = "登录密码 MD5加密")
@@ -91,23 +92,23 @@ public class UserInfo extends BaseBusinessEntity {
     @ApiModelProperty(value = "微信openid")
     private String openid;
 
-    /** 驾校全国统一编号 */
-    @Excel(name = "驾校全国统一编号")
-    @TableField("inscode")
-    @ApiModelProperty(value = "驾校全国统一编号")
-    private String inscode;
+    /** 业务类型  0:初领 1:增领 9:其他 */
+    @Excel(name = "业务类型  0:初领 1:增领 9:其他")
+    @TableField("busitype")
+    @ApiModelProperty(value = "业务类型  0:初领 1:增领 9:其他")
+    private String busitype;
 
-    /** 驾校班型Id */
-    @Excel(name = "驾校班型Id")
-    @TableField(value ="school_class_type_id")
-    @ApiModelProperty(value = "驾校班型Id")
-    private Long schoolClassTypeId;
+    /** 原准驾车型 */
+    @Excel(name = "原准驾车型")
+    @TableField("perdritype")
+    @ApiModelProperty(value = "原准驾车型")
+    private String perdritype;
 
     /** 培训车型 */
     @Excel(name = "培训车型")
-    @TableField("pxcx")
+    @TableField("traintype")
     @ApiModelProperty(value = "培训车型")
-    private String pxcx;
+    private String traintype;
 
     /** 教练全国统一编号 */
     @Excel(name = "教练全国统一编号")
@@ -121,5 +122,168 @@ public class UserInfo extends BaseBusinessEntity {
     @ApiModelProperty(value = "0 启用 1禁用")
     private Integer status;
 
+    /** 全国平台照片ID */
+    @Excel(name = "全国平台照片ID")
+    @TableField("photo")
+    @ApiModelProperty(value = "全国平台照片ID")
+    private Long photo;
+
+    /** 驾校班型Id */
+    @Excel(name = "驾校班型Id")
+    @TableField("school_class_type_id")
+    @ApiModelProperty(value = "驾校班型Id")
+    private Long schoolClassTypeId;
+
+    public void setId(Long id){
+        this.id = id;
+    }
+
+    public Long getId(){
+        return id;
+    }
+    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 setSex(Long sex){
+        this.sex = sex;
+    }
+
+    public Long getSex(){
+        return sex;
+    }
+    public void setCardtype(Long cardtype){
+        this.cardtype = cardtype;
+    }
+
+    public Long getCardtype(){
+        return cardtype;
+    }
+    public void setIdcard(String idcard){
+        this.idcard = idcard;
+    }
+
+    public String getIdcard(){
+        return idcard;
+    }
+    public void setBirthday(Date birthday){
+        this.birthday = birthday;
+    }
+
+    public Date getBirthday(){
+        return birthday;
+    }
+    public void setPhone(String phone){
+        this.phone = phone;
+    }
+
+    public String getPhone(){
+        return phone;
+    }
+    public void setPassword(String password){
+        this.password = password;
+    }
+
+    public String getPassword(){
+        return password;
+    }
+    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 setBusitype(String busitype){
+        this.busitype = busitype;
+    }
+
+    public String getBusitype(){
+        return busitype;
+    }
+    public void setPerdritype(String perdritype){
+        this.perdritype = perdritype;
+    }
+
+    public String getPerdritype(){
+        return perdritype;
+    }
+    public void setTraintype(String traintype){
+        this.traintype = traintype;
+    }
+
+    public String getTraintype(){
+        return traintype;
+    }
+    public void setCoachnum(String coachnum){
+        this.coachnum = coachnum;
+    }
+
+    public String getCoachnum(){
+        return coachnum;
+    }
+    public void setStatus(Integer status){
+        this.status = status;
+    }
+
+    public Integer getStatus(){
+        return status;
+    }
+    public void setPhoto(Long photo){
+        this.photo = photo;
+    }
+
+    public Long getPhoto(){
+        return photo;
+    }
+    public void setSchoolClassTypeId(Long schoolClassTypeId){
+        this.schoolClassTypeId = schoolClassTypeId;
+    }
+
+    public Long getSchoolClassTypeId(){
+        return schoolClassTypeId;
+    }
 
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("inscode", getInscode())
+            .append("name", getName())
+            .append("sex", getSex())
+            .append("cardtype", getCardtype())
+            .append("idcard", getIdcard())
+            .append("birthday", getBirthday())
+            .append("phone", getPhone())
+            .append("password", getPassword())
+            .append("wechar", getWechar())
+            .append("openid", getOpenid())
+            .append("busitype", getBusitype())
+            .append("perdritype", getPerdritype())
+            .append("traintype", getTraintype())
+            .append("createTime", getCreateTime())
+            .append("updateTime", getUpdateTime())
+            .append("coachnum", getCoachnum())
+            .append("status", getStatus())
+            .append("photo", getPhoto())
+            .append("schoolClassTypeId", getSchoolClassTypeId())
+            .toString();
+    }
 }

hzgzpt-common/src/main/java/com/miaxis/common/core/domain/model/LoginUser.java

@@ -127,7 +127,7 @@ public class LoginUser implements UserDetails
         if (user != null){
             return user.getUserName();
         }else{
-            return student.getMobile();
+            return student.getPhone();
         }
     }
 

hzgzpt-service-app/src/main/java/com/miaxis/app/user/dto/UserDto.java

@@ -20,17 +20,17 @@ public class UserDto extends BaseBusinessEntity {
     @ApiModelProperty(value = "性别")
     private Long sex;
 
-    @ApiModelProperty(value = "身份证明号码 1：身份证号，2：警官证，3：军官证，4：护照等")
-    private Long sfzmlx;
+    @ApiModelProperty(value = "身份证明号码 1：身份证号，2：护照，3：军官证，4：其他")
+    private Long cardtype;
 
     @ApiModelProperty(value = "身份证明号码")
-    private String idCard;
+    private String idcard;
 
     @ApiModelProperty(value = "出生日期")
     private Date birthday;
 
     @ApiModelProperty(value = "手机号码")
-    private String mobile;
+    private String phone;
 
     @ApiModelProperty(value = "登录密码 MD5加密")
     private String password;
@@ -45,7 +45,7 @@ public class UserDto extends BaseBusinessEntity {
     private String inscode;
 
     @ApiModelProperty(value = "培训车型")
-    private String pxcx;
+    private String traintype;
 
     @ApiModelProperty(value = "驾校班型Id")
     private Long schoolClassTypeId;

hzgzpt-service-app/src/main/java/com/miaxis/app/user/service/impl/UserInfoServiceImpl.java

@@ -19,6 +19,7 @@ import com.miaxis.common.core.domain.entity.UserInfo;
 import com.miaxis.common.exception.CustomException;
 import com.miaxis.common.utils.DateUtils;
 import com.miaxis.common.utils.RedisPrefixUtils;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
@@ -130,7 +131,7 @@ public class UserInfoServiceImpl extends ServiceImpl<UserInfoMapper, UserInfo> i
 
         UserInfo userInfo = new UserInfo();
         userInfo.setId(user.getUserId());
-        userInfo.setMobile(phone);
+        userInfo.setPhone(phone);
         //更新绑定手机号
         userInfoMapper.updateById(userInfo);
 
@@ -147,8 +148,8 @@ public class UserInfoServiceImpl extends ServiceImpl<UserInfoMapper, UserInfo> i
     public Response saveUserInformation(UserDto userDto) {
 
         //生成短信缓存前缀
-        String smsKeyPrefix = RedisPrefixUtils.getSmsKeyPrefix("signUp", userDto.getMobile());
-        String smsKeyCountPrefix = RedisPrefixUtils.getSmsKeyCountPrefix("signUp", userDto.getMobile());
+        String smsKeyPrefix = RedisPrefixUtils.getSmsKeyPrefix("signUp", userDto.getPhone());
+        String smsKeyCountPrefix = RedisPrefixUtils.getSmsKeyCountPrefix("signUp", userDto.getPhone());
 
         //查看验证码是否过期
         if (redisTemplate.hasKey(smsKeyCountPrefix) &&
@@ -163,15 +164,8 @@ public class UserInfoServiceImpl extends ServiceImpl<UserInfoMapper, UserInfo> i
 
         //用户信息表
         UserInfo userInfo = new UserInfo();
-        userInfo.setName(userDto.getName());
-        userInfo.setSex(userDto.getSex());
-        userInfo.setSfzmlx(1l);
-        userInfo.setIdCard(userDto.getIdCard());
-        userInfo.setMobile(userDto.getMobile());
-        userInfo.setInscode(userDto.getInscode());
-        userInfo.setPxcx(userDto.getPxcx());
-        userInfo.setSchoolClassTypeId(userDto.getSchoolClassTypeId());
-        userInfo.setCoachnum(userDto.getCoachnum());
+        BeanUtils.copyProperties(userDto,userInfo);
+        userInfo.setCardtype(1l);
         userInfo.setStatus(0);
         userInfoMapper.insert(userInfo);
 
@@ -180,7 +174,7 @@ public class UserInfoServiceImpl extends ServiceImpl<UserInfoMapper, UserInfo> i
         UserRegister userRegister = new UserRegister();
         userRegister.setUserId(userInfo.getId());
         userRegister.setInscode(userDto.getInscode());
-        userRegister.setBmcx(userDto.getPxcx());
+        userRegister.setBmcx(userDto.getTraintype());
         userRegister.setCoachnum(userDto.getCoachnum());
         userRegister.setClassId(userDto.getSchoolClassTypeId());
         userRegisterMapper.insert(userRegister);

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

@@ -1,156 +1,30 @@
 <?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="inscode"    column="inscode"    />
         <result property="name"    column="name"    />
         <result property="sex"    column="sex"    />
-        <result property="sfzmlx"    column="sfzmlx"    />
-        <result property="idCard"    column="id_card"    />
-        <result property="crdate"    column="crdate"    />
+        <result property="cardtype"    column="cardtype"    />
+        <result property="idcard"    column="idcard"    />
         <result property="birthday"    column="birthday"    />
-        <result property="mobile"    column="mobile"    />
+        <result property="phone"    column="phone"    />
         <result property="password"    column="password"    />
         <result property="wechar"    column="wechar"    />
         <result property="openid"    column="openid"    />
-        <result property="inscode"    column="inscode"    />
+        <result property="busitype"    column="busitype"    />
+        <result property="perdritype"    column="perdritype"    />
+        <result property="traintype"    column="traintype"    />
         <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="coachnum"    column="coachnum"    />
         <result property="status"    column="status"    />
+        <result property="photo"    column="photo"    />
+        <result property="schoolClassTypeId"    column="school_class_type_id"    />
     </resultMap>
 
-    <sql id="selectUserInfoVo">
-        select id, name, sex, sfzmlx, id_card, crdate, birthday, mobile,  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>
-            <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 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>
-            <if test="password != null  and password != ''"> and password = #{password}</if>
-            <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="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>
-    <select id="selectUserInfoByMobile"  resultMap="UserInfoResult">
-        <include refid="selectUserInfoVo"/>
-        where mobile = #{mobile}
-    </select>
-
-    <insert id="insertUserInfo" parameterType="UserInfo">
-        insert into user_info
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="id != null">id,</if>
-            <if test="name != null">name,</if>
-            <if test="sex != null">sex,</if>
-            <if test="sfzmlx != null">sfzmlx,</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>
-            <if test="password != null">password,</if>
-            <if test="wechar != null">wechar,</if>
-            <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="coachnum != null">coachnum,</if>
-            <if test="status != null">status,</if>
-        </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="id != null">#{id},</if>
-            <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="crdate != null">#{crdate},</if>
-            <if test="birthday != null">#{birthday},</if>
-            <if test="mobile != null">#{mobile},</if>
-            <if test="password != null">#{password},</if>
-            <if test="wechar != null">#{wechar},</if>
-            <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="coachnum != null">#{coachnum},</if>
-            <if test="status != null">#{status},</if>
-        </trim>
-    </insert>
-
-    <update id="updateUserInfo" parameterType="UserInfo">
-        update user_info
-        <trim prefix="SET" suffixOverrides=",">
-            <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">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>
-            <if test="password != null">password = #{password},</if>
-            <if test="wechar != null">wechar = #{wechar},</if>
-            <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="coachnum != null">coachnum = #{coachnum},</if>
-            <if test="status != null">status = #{status},</if>
-        </trim>
-        where id = #{id}
-    </update>
-
-    <delete id="deleteUserInfoById" parameterType="Long">
-        delete from user_info where id = #{id}
-    </delete>
-
-    <delete id="deleteUserInfoByIds" parameterType="String">
-        delete from user_info where id in
-        <foreach item="id" collection="array" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </delete>
-
-    <select id="getMyRegistrationInformation" resultType="UserVo">
-        SELECT
-        u.name,
-        u.mobile,
-        DATE_FORMAT(u.create_time,'%Y-%m-%d %H:%i:%s') AS createDate,
-        s.name as schoolName,
-        sct.class_name as className,
-        sct.price as classPrice
-        FROM
-        user_info u
-        LEFT JOIN school_info s ON s.inscode = u.inscode
-        LEFT JOIN school_info_class_type sct ON sct.id = u.school_class_type_id
-        where u.id = #{userId}
-    </select>
-
 </mapper>