From 601ab3a545bdd963f4c141f8abdf34a4f2048180 Mon Sep 17 00:00:00 2001 From: mzh820631607 Date: Sun, 27 Sep 2020 21:09:14 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=B8=AD=E5=BF=83=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E8=B5=84=E6=96=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/msdw/tms/api/UserControllerApi.java | 2 +- src/main/java/com/msdw/tms/controller/UserController.java | 6 +++--- src/main/java/com/msdw/tms/dao/UserDao.java | 2 +- .../java/com/msdw/tms/entity/EvaluationQuestionEntity.java | 4 ---- src/main/java/com/msdw/tms/service/UserService.java | 2 +- .../java/com/msdw/tms/service/impl/UserServiceImpl.java | 4 ++-- src/main/resources/mapper/tms/EvaluationQuestionDao.xml | 2 -- src/main/resources/mapper/tms/UserDao.xml | 7 +------ 8 files changed, 9 insertions(+), 20 deletions(-) diff --git a/src/main/java/com/msdw/tms/api/UserControllerApi.java b/src/main/java/com/msdw/tms/api/UserControllerApi.java index 2cd9ee9..51130d1 100644 --- a/src/main/java/com/msdw/tms/api/UserControllerApi.java +++ b/src/main/java/com/msdw/tms/api/UserControllerApi.java @@ -13,7 +13,7 @@ import java.util.List; public interface UserControllerApi { @ApiOperation(value = "个人中心信息展示",notes = "个人中心信息展示") - R userInfo(Integer id, List personalFileId); + R userInfo(Integer id); @ApiOperation(value = "个人中心信息修改",notes = "个人中心信息修改") R update(UserProsonalEntityVo userProsonalEntityVo); diff --git a/src/main/java/com/msdw/tms/controller/UserController.java b/src/main/java/com/msdw/tms/controller/UserController.java index 107fead..097438e 100644 --- a/src/main/java/com/msdw/tms/controller/UserController.java +++ b/src/main/java/com/msdw/tms/controller/UserController.java @@ -46,10 +46,10 @@ public class UserController implements UserControllerApi { } @Override - @PostMapping("/userinfo/{id}") - public R userInfo(@PathVariable("id") Integer id,@RequestBody List personalFileId){ + @GetMapping("/userinfo/{id}") + public R userInfo(@PathVariable("id") Integer id){ - HashMap userEntityVoList = userService.queryUserInfo(id,personalFileId); + HashMap userEntityVoList = userService.queryUserInfo(id); // UserEntityVo userEntityVo = userService.queryUserId(id); return R.ok().put("data",userEntityVoList); } diff --git a/src/main/java/com/msdw/tms/dao/UserDao.java b/src/main/java/com/msdw/tms/dao/UserDao.java index ed50495..b0f20ef 100644 --- a/src/main/java/com/msdw/tms/dao/UserDao.java +++ b/src/main/java/com/msdw/tms/dao/UserDao.java @@ -15,6 +15,6 @@ public interface UserDao extends BaseMapper { void updateUserPersonal(UserEntityVo vo); - List queryPersonalFile(Integer userid,List personalFileId); + List queryPersonalFile(Integer userid); List queryUserInfo(Integer userid); } diff --git a/src/main/java/com/msdw/tms/entity/EvaluationQuestionEntity.java b/src/main/java/com/msdw/tms/entity/EvaluationQuestionEntity.java index 7e2bb12..e69c1ee 100644 --- a/src/main/java/com/msdw/tms/entity/EvaluationQuestionEntity.java +++ b/src/main/java/com/msdw/tms/entity/EvaluationQuestionEntity.java @@ -55,9 +55,5 @@ public class EvaluationQuestionEntity implements Serializable { * 试题得分 */ private Integer questionScore; - /** - * 测评类型(0虚拟仿真实验，1教学实验) - */ - private Integer type; } diff --git a/src/main/java/com/msdw/tms/service/UserService.java b/src/main/java/com/msdw/tms/service/UserService.java index bb5ec21..1f1541e 100644 --- a/src/main/java/com/msdw/tms/service/UserService.java +++ b/src/main/java/com/msdw/tms/service/UserService.java @@ -18,5 +18,5 @@ public interface UserService extends IService { void updateUserPersonal(UserEntityVo personalFile); - HashMap queryUserInfo(Integer id, List personalFileId); + HashMap queryUserInfo(Integer id); } diff --git a/src/main/java/com/msdw/tms/service/impl/UserServiceImpl.java b/src/main/java/com/msdw/tms/service/impl/UserServiceImpl.java index 10ca945..92385ca 100644 --- a/src/main/java/com/msdw/tms/service/impl/UserServiceImpl.java +++ b/src/main/java/com/msdw/tms/service/impl/UserServiceImpl.java @@ -49,13 +49,13 @@ public class UserServiceImpl extends ServiceImpl implements } @Override - public HashMap queryUserInfo(Integer id,List personalIds) { + public HashMap queryUserInfo(Integer id) { HashMap map = new HashMap(); //用户sql user List userInfo = userMapper.queryUserInfo(id); map.put("userInfo",userInfo); //个人档案sql - List userEntityVos = userMapper.queryPersonalFile(id, personalIds); + List userEntityVos = userMapper.queryPersonalFile(id); map.put("userPersonalFile",userEntityVos); return map; } diff --git a/src/main/resources/mapper/tms/EvaluationQuestionDao.xml b/src/main/resources/mapper/tms/EvaluationQuestionDao.xml index e506f11..eab21eb 100644 --- a/src/main/resources/mapper/tms/EvaluationQuestionDao.xml +++ b/src/main/resources/mapper/tms/EvaluationQuestionDao.xml @@ -19,8 +19,6 @@ UPDATE tms_evaluation_question - set - type = 0, question_status=#{questionStatus, jdbcType=INTEGER}, diff --git a/src/main/resources/mapper/tms/UserDao.xml b/src/main/resources/mapper/tms/UserDao.xml index fe45dc0..e1436fb 100644 --- a/src/main/resources/mapper/tms/UserDao.xml +++ b/src/main/resources/mapper/tms/UserDao.xml @@ -30,7 +30,7 @@ u.provinceId = pro.provinceId AND u.schoolId = s.schoolId AND u.cityId = c.cityId - AND u.isdel = #{pro.isdel} + AND u.isdel = 0 AND u.provinceId = c.provinceId AND u.userId = #{userid} AND pro.isdel = 0 @@ -58,11 +58,6 @@ per.schoolId = s.schoolId AND per.userId = #{userid} AND s.isdel = 0 - AND per.personalFileId IN - - #{personalFileId} - -