Compare commits
No commits in common. "14c726cb9a888676c723bfd20d47c905a7c29a40" and "2c90fcd0530de4fdd7efdb32b0a514d70e8061e0" have entirely different histories.
14c726cb9a
...
2c90fcd053
@ -226,14 +226,6 @@ public class ProjectController {
|
||||
return projectService.projecWorktAdd(request, projectWorkVO);
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取负责人id
|
||||
* @return
|
||||
*/
|
||||
@GetMapping("/project/pri")
|
||||
public BaseResponse projectPrincipalGet(){
|
||||
return projectService.projectPrincipalGet();
|
||||
}
|
||||
|
||||
/**
|
||||
* 用户获取所分到的项目模块
|
||||
|
@ -3,7 +3,6 @@ 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;
|
||||
@ -95,8 +94,4 @@ 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();
|
||||
}
|
||||
|
@ -1,10 +0,0 @@
|
||||
package com.jsl.oa.model.voData;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class PrincipalSelectVO {
|
||||
private Integer id;
|
||||
private String username;
|
||||
private String roleName;
|
||||
}
|
@ -11,9 +11,11 @@ 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;
|
||||
|
@ -47,6 +47,4 @@ public interface ProjectService {
|
||||
BaseResponse getById(Integer id);
|
||||
|
||||
BaseResponse getWorkById(Integer id);
|
||||
|
||||
BaseResponse projectPrincipalGet();
|
||||
}
|
||||
|
@ -8,7 +8,6 @@ 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;
|
||||
@ -47,7 +46,6 @@ 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;
|
||||
@ -172,11 +170,6 @@ 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 方法");
|
||||
|
Loading…
x
Reference in New Issue
Block a user