From ac14b6e6e8de485a2d7b02cea1a9214cc1e28f41 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Wed, 22 Sep 2021 10:39:18 +0800
Subject: [PATCH] 培训考试生成修改
---
src/main/java/org/springblade/modules/system/mapper/UserMapper.xml | 9 +++++++--
src/main/java/org/springblade/modules/training/controller/TrainingRegistrationController.java | 4 ++--
src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java | 12 ++++++++++--
src/main/java/org/springblade/modules/system/controller/UserController.java | 4 ++--
src/main/java/org/springblade/modules/system/mapper/UserMapper.java | 9 ++++++++-
src/main/java/org/springblade/modules/system/service/IUserService.java | 2 +-
6 files changed, 30 insertions(+), 10 deletions(-)
diff --git a/src/main/java/org/springblade/modules/system/controller/UserController.java b/src/main/java/org/springblade/modules/system/controller/UserController.java
index 7d3e33d..bee74de 100644
--- a/src/main/java/org/springblade/modules/system/controller/UserController.java
+++ b/src/main/java/org/springblade/modules/system/controller/UserController.java
@@ -166,8 +166,8 @@
@ApiOperation(value = "列表", notes = "传入account和realName")
//@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
public R<IPage<UserVO>> page(@ApiIgnore User user, Query query, Long deptId, BladeUser bladeUser) {
- IPage<User> pages = userService.selectUserPage(Condition.getPage(query), user, deptId, (bladeUser.getTenantId().equals(BladeConstant.ADMIN_TENANT_ID) ? StringPool.EMPTY : bladeUser.getTenantId()));
- return R.data(UserWrapper.build().pageVO(pages));
+ IPage<UserVO> pages = userService.selectUserPage(Condition.getPage(query), user, deptId, (bladeUser.getTenantId().equals(BladeConstant.ADMIN_TENANT_ID) ? StringPool.EMPTY : bladeUser.getTenantId()));
+ return R.data(pages);
}
/**
diff --git a/src/main/java/org/springblade/modules/system/mapper/UserMapper.java b/src/main/java/org/springblade/modules/system/mapper/UserMapper.java
index f75fdb6..dee14cf 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.java
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.java
@@ -59,7 +59,7 @@
* @param tenantId
* @return
*/
- List<User> selectUserPage(IPage<User> page, @Param("user") User user, @Param("deptIdList") List<Long> deptIdList, @Param("tenantId") String tenantId);
+ List<UserVO> selectUserPage(IPage<UserVO> page, @Param("user") User user, @Param("deptIdList") List<Long> deptIdList, @Param("tenantId") String tenantId);
/**
* 获取用户
@@ -184,4 +184,11 @@
* @return
*/
Integer selectCountAccount(@Param("account") String account);
+
+ /**
+ * 查询当前部门名称及父级部门名称
+ * @param deptId 部门名称
+ * @return
+ */
+ List<Map<String, Object>> getDeptName(String deptId);
}
diff --git a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
index 7123f03..0173c42 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
@@ -150,8 +150,8 @@
<if test="user.hold!=null and user.hold != ''">
and hold = #{user.hold}
</if> <if test="user.jurisdiction!=null and user.jurisdiction != ''">
- and jurisdiction = #{user.jurisdiction}
- </if>
+ and jurisdiction = #{user.jurisdiction}
+ </if>
<if test="user.securitynumber!=null and user.securitynumber != ''">
and securitynumber = #{user.securitynumber}
</if>
@@ -489,4 +489,9 @@
<select id="selectCountAccount" resultType="java.lang.Integer">
select count(*) from blade_user where account = #{account}
</select>
+
+ <!--查询当前部门名称及父级部门名称-->
+ <select id="getDeptName" resultType="java.util.Map">
+
+ </select>
</mapper>
diff --git a/src/main/java/org/springblade/modules/system/service/IUserService.java b/src/main/java/org/springblade/modules/system/service/IUserService.java
index 44a5bdf..3d920b9 100644
--- a/src/main/java/org/springblade/modules/system/service/IUserService.java
+++ b/src/main/java/org/springblade/modules/system/service/IUserService.java
@@ -82,7 +82,7 @@
* @param tenantId
* @return
*/
- IPage<User> selectUserPage(IPage<User> page, User user, Long deptId, String tenantId);
+ IPage<UserVO> selectUserPage(IPage<UserVO> page, User user, Long deptId, String tenantId);
/**
* 自定义分页
diff --git a/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java b/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
index 2588620..2e186a2 100644
--- a/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
+++ b/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
@@ -180,9 +180,17 @@
}
@Override
- public IPage<User> selectUserPage(IPage<User> page, User user, Long deptId, String tenantId) {
+ public IPage<UserVO> selectUserPage(IPage<UserVO> page, User user, Long deptId, String tenantId) {
List<Long> deptIdList = SysCache.getDeptChildIds(deptId);
- return page.setRecords(baseMapper.selectUserPage(page, user, deptIdList, tenantId));
+ List<UserVO> users = baseMapper.selectUserPage(page, user, deptIdList, tenantId);
+ //遍历获取部门名称，角色名称
+ users.forEach(userVO -> {
+ //查询当前部门名称及父级部门名称
+ List<Map<String,Object>> map = baseMapper.getDeptName(userVO.getDeptId());
+ //查询角色名称
+
+ });
+ return page.setRecords(users);
}
@Override
diff --git a/src/main/java/org/springblade/modules/training/controller/TrainingRegistrationController.java b/src/main/java/org/springblade/modules/training/controller/TrainingRegistrationController.java
index 06971db..0947760 100644
--- a/src/main/java/org/springblade/modules/training/controller/TrainingRegistrationController.java
+++ b/src/main/java/org/springblade/modules/training/controller/TrainingRegistrationController.java
@@ -538,7 +538,7 @@
/**
- * 生成试卷,报名
+ * 生成试卷,报名，考试申请
* @param trainingRegistrationVo 考试开始时
*/
@PostMapping("/batchExam")
@@ -586,7 +586,7 @@
//修改报名信息
applyIds.forEach(trainingRegistration ->{
- if(null==trainingRegistration.getTrainExamId() && trainingRegistration.getTrainExamId()=="") {
+ if(null==trainingRegistration.getTrainExamId() || trainingRegistration.getTrainExamId()=="") {
trainingRegistration.setTrainExamId(examPaper.getId().toString());
//提交考试审核
trainingRegistration.setAuditStatus(3);
--
Gitblit v1.9.3