个人中心

src/main/java/com/msdw/tms/controller/UserController.java

@@ -3,9 +3,13 @@ package com.msdw.tms.controller;
 import com.msdw.tms.api.UserControllerApi;
 import com.msdw.tms.common.utils.PageUtils;
 import com.msdw.tms.common.utils.R;
+import com.msdw.tms.entity.PersonalFileEntity;
 import com.msdw.tms.entity.UserEntity;
+import com.msdw.tms.entity.UserInfoEntity;
+import com.msdw.tms.entity.UserPersonalFileEntity;
 import com.msdw.tms.entity.vo.UserEntityVo;
 import com.msdw.tms.entity.vo.UserProsonalEntityVo;
+import com.msdw.tms.service.UserInfoService;
 import com.msdw.tms.service.UserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
@@ -22,6 +26,8 @@ public class UserController implements UserControllerApi {
 
     @Autowired
     private UserService userService;
+    @Autowired
+    private UserInfoService userInfoService;
 
     /**
      * 列表
@@ -71,15 +77,33 @@ public class UserController implements UserControllerApi {
     @Transactional
     @PutMapping("/update")
     public R update(@RequestBody UserProsonalEntityVo vo){
-        List<UserEntityVo> userEntityVoList = vo.getUserEntityVoList();
-        UserEntity userInfo = vo.getUserEntity();
-        userService.updateById(userInfo);
-        for (int i = 0;i<userEntityVoList.size();i++){
-            UserEntityVo personalFile = userEntityVoList.get(i);
+        List<UserPersonalFileEntity> entityList = vo.getPersonalFileEntities();
+        UserInfoEntity userInfo = vo.getUserInfoEntity();
+
+        userInfoService.updateUserInfoById(userInfo);
+//        userInfoService.updateById(userInfo);
+        for (int i = 0;i<entityList.size();i++){
+            UserPersonalFileEntity personalFile = entityList.get(i);
             userService.updateUserPersonal(personalFile);
         }
         return R.ok();
     }
+//    /**
+//     * 修改
+//     */
+//    @Override
+//    @Transactional
+//    @PutMapping("/update")
+//    public R update(@RequestBody UserProsonalEntityVo vo){
+//        List<UserEntityVo> userEntityVoList = vo.getUserEntityVoList();
+//        UserEntity userInfo = vo.getUserEntity();
+//        userService.updateById(userInfo);
+//        for (int i = 0;i<userEntityVoList.size();i++){
+//            UserEntityVo personalFile = userEntityVoList.get(i);
+//            userService.updateUserPersonal(personalFile);
+//        }
+//        return R.ok();
+//    }
 
     /**
      * 删除

src/main/java/com/msdw/tms/dao/UserDao.java

@@ -2,6 +2,7 @@ package com.msdw.tms.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.msdw.tms.entity.UserEntity;
+import com.msdw.tms.entity.UserPersonalFileEntity;
 import com.msdw.tms.entity.vo.UserEntityVo;
 import com.msdw.tms.entity.vo.UserProsonalEntityVo;
 import org.apache.ibatis.annotations.Mapper;
@@ -13,7 +14,7 @@ public interface UserDao extends BaseMapper<UserEntity> {
 
     UserEntityVo getByUserId(UserEntity userEntity);
 
-    void updateUserPersonal(UserEntityVo vo);
+    void updateUserPersonal(UserPersonalFileEntity vo);
 
     List<UserProsonalEntityVo> queryPersonalFile(Integer userid);
     List<UserProsonalEntityVo> queryUserInfo(Integer userid);

src/main/java/com/msdw/tms/dao/UserInfoDao.java

@@ -11,4 +11,6 @@ import org.apache.ibatis.annotations.Mapper;
 public interface UserInfoDao extends BaseMapper<UserInfoEntity> {
 
     Boolean add(UserInfoEntity userEntity);
+
+    void userInfupdateUserInfoById(UserInfoEntity entity);
 }

src/main/java/com/msdw/tms/entity/UserPersonalFileEntity.java

@@ -1,4 +1,4 @@
-package com.msdw.tms.entity.vo;
+package com.msdw.tms.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -6,10 +6,13 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
+import java.io.Serializable;
+
 @Accessors(chain = true)
 @Data
 @TableName("hr_personal_file")
-public class personalFile {
+public class UserPersonalFileEntity implements Serializable {
+    private static final long serialVersionUID = 1L;
     //个人档案
     @TableId(type = IdType.AUTO)
     private Integer personalFileId;
@@ -36,3 +39,5 @@ public class personalFile {
     //修改时间
     private String updatetime;
 }
+
+

src/main/java/com/msdw/tms/entity/vo/UserProsonalEntityVo.java

@@ -1,12 +1,20 @@
 package com.msdw.tms.entity.vo;
 
+import cn.hutool.system.UserInfo;
 import com.msdw.tms.entity.UserEntity;
+import com.msdw.tms.entity.UserInfoEntity;
+import com.msdw.tms.entity.UserPersonalFileEntity;
 import lombok.Data;
 
 import java.util.List;
 @Data
 public class UserProsonalEntityVo {
+
+    private List<UserPersonalFileEntity> personalFileEntities;
+    private UserInfoEntity userInfoEntity;
+
     private UserEntity userEntity;
+    //测试用
     private List<UserEntityVo> userEntityVoList;
 
 }

src/main/java/com/msdw/tms/service/UserInfoService.java

@@ -12,4 +12,6 @@ public interface UserInfoService extends IService<UserInfoEntity> {
     PageUtils queryPage(Map<String, Object> params);
 
     R add(UserInfoEntity userInfoEntity);
+
+    void updateUserInfoById(UserInfoEntity entity);
 }

src/main/java/com/msdw/tms/service/UserService.java

@@ -3,11 +3,12 @@ package com.msdw.tms.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.msdw.tms.common.utils.PageUtils;
 import com.msdw.tms.entity.UserEntity;
+import com.msdw.tms.entity.UserInfoEntity;
+import com.msdw.tms.entity.UserPersonalFileEntity;
 import com.msdw.tms.entity.vo.UserEntityVo;
 import com.msdw.tms.entity.vo.UserProsonalEntityVo;
 
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 
 public interface UserService extends IService<UserEntity> {
@@ -16,7 +17,8 @@ public interface UserService extends IService<UserEntity> {
 
     UserEntityVo queryUserId(Integer userId);
 
-    void updateUserPersonal(UserEntityVo personalFile);
+
+    void updateUserPersonal(UserPersonalFileEntity personalFile);
 
     HashMap<String,UserProsonalEntityVo> queryUserInfo(Integer id);
 }

src/main/java/com/msdw/tms/service/impl/UserInfoServiceImpl.java

@@ -12,6 +12,7 @@ import com.msdw.tms.entity.response.CommonCode;
 import com.msdw.tms.entity.response.ResponseResult;
 import com.msdw.tms.entity.response.ResultCode;
 import com.msdw.tms.service.UserInfoService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.HashMap;
@@ -19,6 +20,8 @@ import java.util.Map;
 
 @Service("userInfoService")
 public class UserInfoServiceImpl extends ServiceImpl<UserInfoDao, UserInfoEntity> implements UserInfoService {
+    @Autowired
+    private UserInfoDao userInfoDao;
 
     @Override
     public PageUtils queryPage(Map<String, Object> params) {
@@ -45,4 +48,8 @@ public R add(UserInfoEntity userInfoEntity) {
         return r;
     }
 }
+    @Override
+    public void updateUserInfoById(UserInfoEntity entity){
+        userInfoDao.userInfupdateUserInfoById(entity);
+    }
 }

src/main/java/com/msdw/tms/service/impl/UserServiceImpl.java

@@ -8,6 +8,8 @@ import com.msdw.tms.common.utils.PageUtils;
 import com.msdw.tms.common.utils.Query;
 import com.msdw.tms.dao.UserDao;
 import com.msdw.tms.entity.UserEntity;
+import com.msdw.tms.entity.UserInfoEntity;
+import com.msdw.tms.entity.UserPersonalFileEntity;
 import com.msdw.tms.entity.vo.UserEntityVo;
 import com.msdw.tms.entity.vo.UserProsonalEntityVo;
 import com.msdw.tms.service.UserService;
@@ -43,8 +45,9 @@ public class UserServiceImpl extends ServiceImpl<UserDao, UserEntity> implements
         return vo;
     }
 
+
     @Override
-    public void updateUserPersonal(UserEntityVo personalFile) {
+    public void updateUserPersonal(UserPersonalFileEntity personalFile) {
         userMapper.updateUserPersonal(personalFile);
     }
 

src/main/resources/mapper/tms/UserDao.xml

@@ -4,7 +4,7 @@
 <mapper namespace="com.msdw.tms.dao.UserDao">
 
 
-	<select id="queryUserInfo" resultType="hashMap">
+	<select id="queryUserInfo" parameterType="com.msdw.tms.entity.UserInfoEntity" resultType="hashMap">
         SELECT
 	        u.userId,
 	        userName,
@@ -41,7 +41,7 @@
             AND s.isdel = 0
     </select>
 
-	<select id="queryPersonalFile" parameterType="com.msdw.tms.entity.UserEntity" resultType="com.msdw.tms.entity.vo.UserEntityVo">
+	<select id="queryPersonalFile" parameterType="com.msdw.tms.entity.PersonalFileEntity" resultType="hashMap">
 		SELECT
 			per.personalFileId,
 			per.schoolId,
@@ -62,7 +62,7 @@
 	        school s
         WHERE
         	per.schoolId = s.schoolId
-        	AND per.userId = #{userid}
+        	AND per.userId = #{userId}
             AND s.isdel = 0
 	</select>
 
@@ -81,7 +81,7 @@
 			per.professionalClassName = #{professionalClassName},
 			per.updatetime = NOW()
 		WHERE
-			per.userId = #{userid}
+			per.userId = #{userId}
 		AND
 			per.personalFileId = #{personalFileId}
 

src/main/resources/mapper/tms/UserInfoDao.xml

@@ -11,4 +11,45 @@
             #{userName}, #{uniqueIdentificationAccount}, #{provinceId},
             #{cityId}, #{schoolId},#{phone}, #{account},#{password},#{roleId})
     </insert>
+
+    <update id="userInfupdateUserInfoById" parameterType="com.msdw.tms.entity.UserInfoEntity">
+        update hr_user_info
+        <set>
+            <if test="account!= null and account != '' ">
+                account = #{account},
+            </if>
+            <if test="countries!= null and countries != '' ">
+                countries = #{countries},
+            </if>
+            <if test="cityId!= null">
+                cityId = #{cityId},
+            </if>
+            <if test="dateBirth != null">
+                dateBirth = #{dateBirth},
+            </if>
+            <if test="documenttype != null">
+                documenttype = #{documenttype},
+            </if>
+            <if test="educationDegree != null">
+                educationDegree = #{educationDegree},
+            </if>
+            <if test="IDNumber != null">
+                IDNumber = #{IDNumber},
+            </if>
+            <if test="provinceId != null">
+                provinceId = #{provinceId},
+            </if>
+            <if test="sex != null">
+                sex = #{sex},
+            </if>
+            <if test="userName != null">
+                userName = #{userName},
+            </if>
+            <if test="schoolId != null">
+                schoolId = #{schoolId},
+            </if>
+        </set>
+        WHERE userId = #{userId};
+
+    </update>
 </mapper>