userMapper.xml还原

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

@@ -34,7 +34,6 @@ public class SchoolRegionController extends BaseController{
     /**
      * 查询驾校训练场列表
      */
-    @PreAuthorize("@ss.hasPermi('school:region:list')")
     @GetMapping("/list")
     @ApiOperation("查询驾校训练场列表")
     @ApiImplicitParams({
@@ -66,8 +65,6 @@ public class SchoolRegionController extends BaseController{
     /**
      * 导出驾校训练场列表
      */
-   // @PreAuthorize("@ss.hasPermi('school:region:export')")
-    @Log(title = "驾校训练场", businessType = BusinessTypeEnum.EXPORT)
     @GetMapping("/export")
     @ApiOperation("导出驾校训练场列表Excel")
     public Response<String> export(@ModelAttribute SchoolRegion schoolRegion){
@@ -79,7 +76,6 @@ public class SchoolRegionController extends BaseController{
     /**
      * 获取驾校训练场详细信息
      */
-    //@PreAuthorize("@ss.hasPermi('school:region:query')")
     @GetMapping(value = "/{id}")
     @ApiOperation("获取驾校训练场详细信息")
     public Response<SchoolRegion> getInfo(
@@ -92,8 +88,6 @@ public class SchoolRegionController extends BaseController{
     /**
      * 新增驾校训练场
      */
-    //@PreAuthorize("@ss.hasPermi('school:region:add')")
-    @Log(title = "驾校训练场", businessType = BusinessTypeEnum.INSERT)
     @PostMapping
     @ApiOperation("新增驾校训练场")
     public Response<Integer> add(@RequestBody SchoolRegion schoolRegion){
@@ -103,8 +97,6 @@ public class SchoolRegionController extends BaseController{
     /**
      * 修改驾校训练场
      */
-    //@PreAuthorize("@ss.hasPermi('school:region:edit')")
-    @Log(title = "驾校训练场", businessType = BusinessTypeEnum.UPDATE)
     @PutMapping
     @ApiOperation("修改驾校训练场")
     public Response<Integer> edit(@RequestBody SchoolRegion schoolRegion){
@@ -114,8 +106,6 @@ public class SchoolRegionController extends BaseController{
     /**
      * 删除驾校训练场
      */
-    //@PreAuthorize("@ss.hasPermi('school:region:remove')")
-    @Log(title = "驾校训练场", businessType = BusinessTypeEnum.DELETE)
 	@DeleteMapping("/{ids}")
     @ApiOperation("删除驾校训练场")
     public  Response<Integer> remove(

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

@@ -120,8 +120,6 @@ public class UserInfoController extends BaseController{
             prefix = PictureTypeEnum.IDCARDREVERSE.getPrefix();
         }else if (PictureTypeEnum.FACES.getCode().equals(type)){
             prefix = PictureTypeEnum.FACES.getPrefix();
-        }else if (PictureTypeEnum.FACES.getCode().equals(type)){
-            prefix = PictureTypeEnum.FACES.getPrefix();
         }else {
             throw new CustomException("类型错误!");
         }

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

@@ -133,156 +133,5 @@ public class UserInfo extends BaseBusinessEntity{
     @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-service-app/src/main/java/com/miaxis/app/user/mapper/UserInfoMapper.java

@@ -20,31 +20,7 @@ public interface UserInfoMapper extends BaseMapper<UserInfo> {
      * @param id 用户信息ID
      * @return 用户信息
      */
-    public UserInfo selectUserInfoById(Long id);
-
-    /**
-     * 查询用户信息列表
-     *
-     * @param userInfo 用户信息
-     * @return 用户信息集合
-     */
-    public List<UserInfo> selectUserInfoList(UserInfo userInfo);
-
-    /**
-     * 新增用户信息
-     *
-     * @param userInfo 用户信息
-     * @return 结果
-     */
-    public int insertUserInfo(UserInfo userInfo);
-
-    /**
-     * 修改用户信息
-     *
-     * @param userInfo 用户信息
-     * @return 结果
-     */
-    public int updateUserInfo(UserInfo userInfo);
+    UserInfo selectUserInfoById(Long id);
 
     /**
      * 删除用户信息
@@ -52,7 +28,7 @@ public interface UserInfoMapper extends BaseMapper<UserInfo> {
      * @param id 用户信息ID
      * @return 结果
      */
-    public int deleteUserInfoById(Long id);
+    int deleteUserInfoById(Long id);
 
     /**
      * 批量删除用户信息
@@ -60,7 +36,7 @@ public interface UserInfoMapper extends BaseMapper<UserInfo> {
      * @param ids 需要删除的数据ID
      * @return 结果
      */
-    public int deleteUserInfoByIds(Long[] ids);
+    int deleteUserInfoByIds(Long[] ids);
 
     /**
      * 获取我的报名信息
@@ -69,5 +45,5 @@ public interface UserInfoMapper extends BaseMapper<UserInfo> {
      */
     UserVo getMyRegistrationInformation(@Param("userId") String userId);
 
-    UserInfo selectUserInfoByMobile(String mobile);
+    UserInfo selectUserInfoByMobile(String phone);
 }

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

@@ -19,7 +19,7 @@ public interface IUserInfoService extends IService<UserInfo>{
      * @param id 用户信息ID
      * @return 用户信息
      */
-    public UserInfo selectUserInfoById(Long id);
+    UserInfo selectUserInfoById(Long id);
 
     /**
      * 修改用户信息
@@ -27,7 +27,7 @@ public interface IUserInfoService extends IService<UserInfo>{
      * @param userInfo 用户信息
      * @return 结果
      */
-    public int updateUserInfo(UserInfo userInfo);
+    int updateUserInfo(UserInfo userInfo);
 
     /**
      * 批量删除用户信息
@@ -35,7 +35,7 @@ public interface IUserInfoService extends IService<UserInfo>{
      * @param ids 需要删除的用户信息ID
      * @return 结果
      */
-    public int deleteUserInfoByIds(Long[] ids);
+    int deleteUserInfoByIds(Long[] ids);
 
 
     /**

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

@@ -21,6 +21,7 @@ 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.context.annotation.Bean;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -88,8 +89,7 @@ public class UserInfoServiceImpl extends ServiceImpl<UserInfoMapper, UserInfo> i
      */
     @Override
     public int updateUserInfo(UserInfo userInfo){
-        userInfo.setUpdateTime(DateUtils.getNowDate());
-        return userInfoMapper.updateUserInfo(userInfo);
+        return userInfoMapper.updateById(userInfo);
     }
 
     /**
@@ -166,7 +166,6 @@ public class UserInfoServiceImpl extends ServiceImpl<UserInfoMapper, UserInfo> i
         UserInfo userInfo = new UserInfo();
         BeanUtils.copyProperties(userDto,userInfo);
         userInfo.setCardtype(1l);
-        userInfo.setStatus(0);
         userInfoMapper.insert(userInfo);
 
 

hzgzpt-service-app/src/main/java/com/miaxis/app/user/vo/UserVo.java

@@ -29,5 +29,5 @@ public class UserVo extends BaseBusinessEntity {
     private String className;
 
     @ApiModelProperty(value = "驾校班型价格")
-    private String classPrice;
+    private String Price;
 }

hzgzpt-service-app/src/main/java/com/miaxis/app/xxx/service/impl/TMClassRecordDetailServiceImpl.java

@@ -1,16 +1,15 @@
 package com.miaxis.app.xxx.service.impl;
 
-import java.util.List;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.miaxis.common.utils.DateUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.apache.commons.lang3.StringUtils;
-import com.miaxis.app.xxx.mapper.TMClassRecordDetailMapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.miaxis.app.xxx.domain.TMClassRecordDetail;
+import com.miaxis.app.xxx.mapper.TMClassRecordDetailMapper;
 import com.miaxis.app.xxx.service.ITMClassRecordDetailService;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
 
 /**
  * 电子教学日志Service业务层处理

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

@@ -27,4 +27,45 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="schoolClassTypeId"    column="school_class_type_id"    />
     </resultMap>
 
+    <sql id="selectUserInfoVo">
+        select id, name, sex, cardtype, idcard, birthday, phone, password,  wechar, openid, busitype, perdritype, traintype, create_time, update_time, coachnum, status,photo,school_class_type_id from user_info
+    </sql>
+
+
+    <select id="selectUserInfoById" parameterType="Long" resultMap="UserInfoResult">
+        <include refid="selectUserInfoVo"/>
+        where id = #{id}
+    </select>
+
+    <select id="selectUserInfoByMobile"  resultMap="UserInfoResult">
+        <include refid="selectUserInfoVo"/>
+        where phone = #{phone}
+    </select>
+
+    <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.phone,
+        DATE_FORMAT(u.create_time,'%Y-%m-%d %H:%i:%s') AS createDate,
+        s.name as schoolName,
+        sct.class_name as className,
+        sct.total_price as price
+        FROM
+        user_info u
+        LEFT JOIN school_info s ON s.inscode = u.inscode
+        LEFT JOIN school_class_type sct ON sct.id = u.school_class_type_id
+        where u.id = #{userId}
+    </select>
+
 </mapper>