返回信息调整

src/main/java/com/jsl/oa/controllers/ProjectController.java

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

src/main/java/com/jsl/oa/mapper/UserMapper.java

@@ -3,6 +3,7 @@ package com.jsl.oa.mapper;
 import com.jsl.oa.model.doData.RoleDO;
 import com.jsl.oa.model.doData.RoleUserDO;
 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.UserEditProfileVO;
 import org.apache.ibatis.annotations.Insert;
@@ -94,4 +95,8 @@ public interface UserMapper {
 
     @Select("SELECT COUNT(*) FROM organize_oa.oa_user")
     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();
 }

src/main/java/com/jsl/oa/model/voData/PrincipalSelectVO.java

@@ -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;
+}

src/main/java/com/jsl/oa/model/voData/ProjectWorkVO.java

@@ -11,11 +11,9 @@ public class ProjectWorkVO {
     private Long pid;
     @NotNull(message = "项目id不能为空")
     private Long projectId;
-
     private Long principalId;
     @NotNull(message = "周期不能为空")
     private Integer cycle;
-
     private Integer workLoad;
     @NotNull(message = "类型不能为空")
     private Integer type;

src/main/java/com/jsl/oa/services/ProjectService.java

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

src/main/java/com/jsl/oa/services/impl/ProjectServiceImpl.java

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