返回信息调整
Some checks failed
JslGroup/JslDeveloper/JSL_OrganizeInternalOA/pipeline/head There was a failure building this commit

This commit is contained in:
176yunxuan 2024-03-16 18:26:37 +08:00
parent 55aa2640cf
commit 14c726cb9a
5 changed files with 32 additions and 0 deletions

View File

@ -226,6 +226,14 @@ public class ProjectController {
return projectService.projecWorktAdd(request, projectWorkVO); return projectService.projecWorktAdd(request, projectWorkVO);
} }
/**
* 获取负责人id
* @return
*/
@GetMapping("/project/pri")
public BaseResponse projectPrincipalGet(){
return projectService.projectPrincipalGet();
}
/** /**
* 用户获取所分到的项目模块 * 用户获取所分到的项目模块

View File

@ -3,6 +3,7 @@ package com.jsl.oa.mapper;
import com.jsl.oa.model.doData.RoleDO; import com.jsl.oa.model.doData.RoleDO;
import com.jsl.oa.model.doData.RoleUserDO; import com.jsl.oa.model.doData.RoleUserDO;
import com.jsl.oa.model.doData.UserDO; import com.jsl.oa.model.doData.UserDO;
import com.jsl.oa.model.voData.PrincipalSelectVO;
import com.jsl.oa.model.voData.UserAllCurrentVO; import com.jsl.oa.model.voData.UserAllCurrentVO;
import com.jsl.oa.model.voData.UserEditProfileVO; import com.jsl.oa.model.voData.UserEditProfileVO;
import org.apache.ibatis.annotations.Insert; import org.apache.ibatis.annotations.Insert;
@ -94,4 +95,8 @@ public interface UserMapper {
@Select("SELECT COUNT(*) FROM organize_oa.oa_user") @Select("SELECT COUNT(*) FROM organize_oa.oa_user")
Long getUsersCount(); Long getUsersCount();
@Select("select oa_user.id,oa_user.username,oa_role.role_name from organize_oa.oa_user join organize_oa.oa_role_user " +
"on oa_user.id = oa_role_user.uid join organize_oa.oa_role on oa_role_user.rid = oa_role.id")
List<PrincipalSelectVO> getPrincipal();
} }

View File

@ -0,0 +1,10 @@
package com.jsl.oa.model.voData;
import lombok.Data;
@Data
public class PrincipalSelectVO {
private Integer id;
private String username;
private String roleName;
}

View File

@ -47,4 +47,6 @@ public interface ProjectService {
BaseResponse getById(Integer id); BaseResponse getById(Integer id);
BaseResponse getWorkById(Integer id); BaseResponse getWorkById(Integer id);
BaseResponse projectPrincipalGet();
} }

View File

@ -8,6 +8,7 @@ import com.jsl.oa.dao.ProjectDAO;
import com.jsl.oa.dao.UserDAO; import com.jsl.oa.dao.UserDAO;
import com.jsl.oa.mapper.ProjectMapper; import com.jsl.oa.mapper.ProjectMapper;
import com.jsl.oa.mapper.RoleMapper; import com.jsl.oa.mapper.RoleMapper;
import com.jsl.oa.mapper.UserMapper;
import com.jsl.oa.model.doData.ProjectCuttingDO; import com.jsl.oa.model.doData.ProjectCuttingDO;
import com.jsl.oa.model.doData.ProjectDO; import com.jsl.oa.model.doData.ProjectDO;
import com.jsl.oa.model.doData.ProjectWorkDO; import com.jsl.oa.model.doData.ProjectWorkDO;
@ -46,6 +47,7 @@ import java.util.Objects;
@RequiredArgsConstructor @RequiredArgsConstructor
public class ProjectServiceImpl implements ProjectService { public class ProjectServiceImpl implements ProjectService {
private final UserMapper userMapper;
private final ProjectMapper projectMapper; private final ProjectMapper projectMapper;
private final RoleMapper roleMapper; private final RoleMapper roleMapper;
private final ProjectDAO projectDAO; private final ProjectDAO projectDAO;
@ -170,6 +172,11 @@ public class ProjectServiceImpl implements ProjectService {
return ResultUtil.success(projectWorkDO); return ResultUtil.success(projectWorkDO);
} }
@Override
public BaseResponse projectPrincipalGet() {
return ResultUtil.success(userMapper.getPrincipal());
}
@Override @Override
public BaseResponse projectEdit(HttpServletRequest request, @NotNull ProjectEditVO projectEdit, Long projectId) { public BaseResponse projectEdit(HttpServletRequest request, @NotNull ProjectEditVO projectEdit, Long projectId) {
log.info("\t> 执行 Service 层 ProjectService.projectEdit 方法"); log.info("\t> 执行 Service 层 ProjectService.projectEdit 方法");