fix:我负责我管理我参与的项目查询重构以及项目增加,系统模块数据表增加截止时间和状态字段
This commit is contained in:
176yunxuan
parent
0516e8dce4
commit
84d3ccc5af
3
pom.xml
3
pom.xml
|
|
@ -17,6 +17,7 @@
|
|||
<java.version>1.8</java.version>
|
||||
<skipTests>true</skipTests>
|
||||
</properties>
|
||||
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
|
|
@ -166,10 +167,12 @@
|
|||
<goal>timestamp-property</goal>
|
||||
</goals>
|
||||
<configuration>
|
||||
|
||||
<name>buildDate</name>
|
||||
<pattern>yyyy-MM-dd HH:mm:ss</pattern>
|
||||
<locale>en_US</locale>
|
||||
<timeZone>GMT+8</timeZone>
|
||||
|
||||
</configuration>
|
||||
</execution>
|
||||
</executions>
|
||||
|
|
|
|||
|
|
@ -54,9 +54,9 @@ public class ProjectController {
|
|||
* @param id 要查询的 id
|
||||
* @return {@link BaseResponse}
|
||||
*/
|
||||
@GetMapping("/project/getwork/id")
|
||||
public BaseResponse projectWorkGetById(@RequestParam Integer id) {
|
||||
return projectService.getWorkById(id);
|
||||
@GetMapping("/project/module/id")
|
||||
public BaseResponse projectModuleGetById(@RequestParam Integer id) {
|
||||
return projectService.getModuleById(id);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -110,7 +110,7 @@ public class ProjectController {
|
|||
* @return {@link BaseResponse}
|
||||
*/
|
||||
@GetMapping("/project/child/get")
|
||||
public BaseResponse projectWorkGet(
|
||||
public BaseResponse projectModuleGet(
|
||||
@RequestParam(required = false) List<String> tags,
|
||||
@RequestParam(required = false) List<String> isFinish,
|
||||
@RequestParam(required = false) Integer is,
|
||||
|
|
@ -179,6 +179,42 @@ public class ProjectController {
|
|||
return projectService.projectEdit(request, projectEdit, projectId);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 获取我负责的项目
|
||||
*
|
||||
* @param page 页数
|
||||
* @param pageSize 每页大小
|
||||
* @param request
|
||||
* @return
|
||||
*/
|
||||
@GetMapping("/project/my/get")
|
||||
public BaseResponse projectMyGet(
|
||||
@RequestParam(required = false, defaultValue = "1") Integer page,
|
||||
@RequestParam(required = false, defaultValue = "10") Integer pageSize,
|
||||
HttpServletRequest request) {
|
||||
return projectService.getPrincipalProject(page, pageSize, request);
|
||||
}
|
||||
|
||||
/**
|
||||
*
|
||||
* 获取我参与的项目
|
||||
*
|
||||
* @param page 页数
|
||||
* @param pageSize 每页大小
|
||||
* @param request
|
||||
* @return
|
||||
*/
|
||||
@GetMapping("/project/participate/get")
|
||||
public BaseResponse projectParticipateGet(
|
||||
@RequestParam(required = false, defaultValue = "1") Integer page,
|
||||
@RequestParam(required = false, defaultValue = "10") Integer pageSize,
|
||||
HttpServletRequest request) {
|
||||
return projectService.getParticipateProject(page, pageSize, request);
|
||||
}
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* 子系统子模块的增加
|
||||
*
|
||||
|
|
@ -219,7 +255,7 @@ public class ProjectController {
|
|||
if (bindingResult.hasErrors()) {
|
||||
return ResultUtil.error(ErrorCode.PARAMETER_ERROR, Processing.getValidatedErrorList(bindingResult));
|
||||
}
|
||||
return ResultUtil.success(projectService.projectAdd(request, projectInfoVO));
|
||||
return projectService.projectAdd(request, projectInfoVO);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -108,7 +108,7 @@ public interface ProjectMapper {
|
|||
List <Long> getMemberBySystemId(Integer id);
|
||||
|
||||
@Select("select * from organize_oa.oa_project_modules "
|
||||
+ "where DATE(deadline) = DATE(#{threeDayLater}) and status = 0")
|
||||
+ "where DATE(dead_line) = DATE(#{threeDayLater}) and status != 'complete' ")
|
||||
List<ProjectModuleDO> getProjectWorkByTime(LocalDateTime threeDayLater);
|
||||
|
||||
|
||||
|
|
@ -126,11 +126,14 @@ public interface ProjectMapper {
|
|||
|
||||
|
||||
@Select("select * from organize_oa.oa_project_child where "
|
||||
+ "DATE (created_at) = DATE (#{threeDaysLater}) ")
|
||||
+ "DATE (dead_line) = DATE (#{threeDaysLater}) and status != 'complete' ")
|
||||
List<ProjectChildDO> getProjectChildByTime(LocalDateTime threeDaysLater);
|
||||
|
||||
|
||||
@Select("select * from organize_oa.oa_project_child where "
|
||||
+ "id = #{id} and is_delete = 0")
|
||||
ProjectChildDO getProjectChildById(Integer id);
|
||||
|
||||
|
||||
List<ProjectDO> getParticipateProject(Long userId);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -23,6 +23,7 @@ public class ProjectInfoVO {
|
|||
private String files;
|
||||
private Timestamp beginTime;
|
||||
private Timestamp completeTime;
|
||||
@NotNull(message = "截止时间不能为空")
|
||||
private Timestamp deadLine;
|
||||
private String status;
|
||||
|
||||
|
|
|
|||
|
|
@ -4,6 +4,8 @@ import com.fasterxml.jackson.annotation.JsonInclude;
|
|||
import lombok.Data;
|
||||
import lombok.experimental.Accessors;
|
||||
|
||||
import java.sql.Date;
|
||||
|
||||
@Data
|
||||
@Accessors(chain = true)
|
||||
@JsonInclude(JsonInclude.Include.NON_NULL)
|
||||
|
|
@ -14,5 +16,8 @@ public class ProjectSimpleVO {
|
|||
private Long cycle;
|
||||
private Long workLoad;
|
||||
private Long id;
|
||||
private String files;
|
||||
private String status;
|
||||
private Date deadLine;
|
||||
private String tags;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -41,9 +41,9 @@ public interface ProjectService {
|
|||
|
||||
BaseResponse projectFileGet(HttpServletRequest request, Long projectId);
|
||||
|
||||
BaseResponse getById(Integer id);
|
||||
BaseResponse getProjectModuleById(Integer id);
|
||||
|
||||
BaseResponse getWorkById(Integer id);
|
||||
BaseResponse getModuleById(Integer id);
|
||||
|
||||
BaseResponse projectPrincipalGet();
|
||||
|
||||
|
|
@ -57,4 +57,10 @@ public interface ProjectService {
|
|||
* @return 根据用户所属角色组的不同返回不同的内容
|
||||
*/
|
||||
BaseResponse getProjectById(HttpServletRequest request, Long projectId);
|
||||
|
||||
BaseResponse getById(Integer id);
|
||||
|
||||
BaseResponse getPrincipalProject(Integer page, Integer pageSize, HttpServletRequest request);
|
||||
|
||||
BaseResponse getParticipateProject(Integer page, Integer pageSize, HttpServletRequest request);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,6 @@
|
|||
package com.jsl.oa.services.impl;
|
||||
import com.github.pagehelper.PageHelper;
|
||||
import com.github.pagehelper.PageInfo;
|
||||
import com.jsl.oa.dao.UserDAO;
|
||||
import com.jsl.oa.mapper.MessageMapper;
|
||||
import com.jsl.oa.mapper.ProjectMapper;
|
||||
|
|
@ -7,7 +9,6 @@ import com.jsl.oa.model.dodata.ProjectChildDO;
|
|||
import com.jsl.oa.model.dodata.ProjectModuleDO;
|
||||
import com.jsl.oa.model.vodata.MessageAddVO;
|
||||
import com.jsl.oa.model.vodata.MessageGetVO;
|
||||
import com.jsl.oa.model.vodata.PageBean;
|
||||
import com.jsl.oa.services.MessageService;
|
||||
import com.jsl.oa.utils.*;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
|
|
@ -67,6 +68,7 @@ public class MessageServiceImpl implements MessageService {
|
|||
endTime = LocalDateTime.now();
|
||||
beginTime = endTime.minusDays(30);
|
||||
}
|
||||
PageHelper.startPage(page, pageSize);
|
||||
List<MessageDO> messageDOList = messageMapper.page(beginTime, endTime, uid);
|
||||
//封装返回数据
|
||||
List<MessageGetVO> messageGetVOList = new ArrayList<>();
|
||||
|
|
@ -89,16 +91,8 @@ public class MessageServiceImpl implements MessageService {
|
|||
}
|
||||
|
||||
//分页返回
|
||||
int start = (page - 1) * pageSize;
|
||||
int end = start + pageSize;
|
||||
List<MessageGetVO> pageData = messageGetVOList.subList(start,
|
||||
Math.min(end, messageGetVOList.size()));
|
||||
PageBean<MessageGetVO> pageBean = new PageBean<>();
|
||||
pageBean.setTotalCount(messageGetVOList.size());
|
||||
pageBean.setCurrentPage(page);
|
||||
pageBean.setPageSize(pageSize);
|
||||
pageBean.setList(pageData);
|
||||
return ResultUtil.success(pageBean);
|
||||
PageInfo<MessageGetVO> pageInfo = new PageInfo<>(messageGetVOList);
|
||||
return ResultUtil.success(pageInfo);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -3,6 +3,8 @@ package com.jsl.oa.services.impl;
|
|||
import com.fasterxml.jackson.core.JsonProcessingException;
|
||||
import com.fasterxml.jackson.databind.JsonNode;
|
||||
import com.fasterxml.jackson.databind.ObjectMapper;
|
||||
import com.github.pagehelper.PageHelper;
|
||||
import com.github.pagehelper.PageInfo;
|
||||
import com.jsl.oa.annotations.NeedPermission;
|
||||
import com.jsl.oa.dao.ProjectDAO;
|
||||
import com.jsl.oa.dao.RoleDAO;
|
||||
|
|
@ -54,10 +56,15 @@ public class ProjectServiceImpl implements ProjectService {
|
|||
|
||||
@Override
|
||||
public BaseResponse projectAdd(HttpServletRequest request, ProjectInfoVO projectAdd) {
|
||||
// 判断权限
|
||||
if (!Processing.checkUserIsPrincipal(request, roleDAO)) {
|
||||
return ResultUtil.error(ErrorCode.NOT_PERMISSION);
|
||||
}
|
||||
|
||||
if (projectAdd.getDescription().isEmpty()) {
|
||||
projectAdd.setDescription("{}");
|
||||
} else {
|
||||
projectAdd.setDescription("{\"description\":\" " + projectAdd.getDescription() + "\"}");
|
||||
projectAdd.setDescription("{\"描述\":\" " + projectAdd.getDescription() + "\"}");
|
||||
}
|
||||
String tags = projectAdd.getTags();
|
||||
String[] split = tags.split(",");
|
||||
|
|
@ -147,6 +154,11 @@ public class ProjectServiceImpl implements ProjectService {
|
|||
|
||||
}
|
||||
|
||||
@Override
|
||||
public BaseResponse getProjectModuleById(Integer id) {
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public BaseResponse getById(Integer id) {
|
||||
ProjectDO projectDO = projectMapper.tgetProjectById(id);
|
||||
|
|
@ -154,7 +166,45 @@ public class ProjectServiceImpl implements ProjectService {
|
|||
}
|
||||
|
||||
@Override
|
||||
public BaseResponse getWorkById(Integer id) {
|
||||
public BaseResponse getPrincipalProject(Integer page, Integer pageSize, HttpServletRequest request) {
|
||||
//获取用户id
|
||||
Long userId = Processing.getAuthHeaderToUserId(request);
|
||||
|
||||
PageHelper.startPage(page, pageSize);
|
||||
List<ProjectDO> projectDOList = projectDAO.get(userId, null, null);
|
||||
|
||||
List<ProjectSimpleVO> projectSimpleVOList = new ArrayList<>();
|
||||
for (ProjectDO projectDO : projectDOList) {
|
||||
ProjectSimpleVO projectSimpleVO1 = new ProjectSimpleVO();
|
||||
Processing.projectTosimply(projectSimpleVO1, projectDO, userDAO, objectMapper);
|
||||
projectSimpleVOList.add(projectSimpleVO1);
|
||||
}
|
||||
//分页返回
|
||||
PageInfo<ProjectSimpleVO> pageInfo = new PageInfo<>(projectSimpleVOList);
|
||||
return ResultUtil.success(pageInfo);
|
||||
}
|
||||
|
||||
@Override
|
||||
public BaseResponse getParticipateProject(Integer page, Integer pageSize, HttpServletRequest request) {
|
||||
//获取用户id
|
||||
Long userId = Processing.getAuthHeaderToUserId(request);
|
||||
|
||||
PageHelper.startPage(page, pageSize);
|
||||
List<ProjectDO> projectDOList = projectMapper.getParticipateProject(userId);
|
||||
|
||||
List<ProjectSimpleVO> projectSimpleVOList = new ArrayList<>();
|
||||
for (ProjectDO projectDO : projectDOList) {
|
||||
ProjectSimpleVO projectSimpleVO1 = new ProjectSimpleVO();
|
||||
Processing.projectTosimply(projectSimpleVO1, projectDO, userDAO, objectMapper);
|
||||
projectSimpleVOList.add(projectSimpleVO1);
|
||||
}
|
||||
//分页返回
|
||||
PageInfo<ProjectSimpleVO> pageInfo = new PageInfo<>(projectSimpleVOList);
|
||||
return ResultUtil.success(pageInfo);
|
||||
}
|
||||
|
||||
@Override
|
||||
public BaseResponse getModuleById(Integer id) {
|
||||
ProjectWorkSimpleVO projectWorkSimpleVO = projectMapper.getWorkById(id);
|
||||
|
||||
projectWorkSimpleVO.setPrincipalUser(userDAO.getUserById(projectMapper.getPid(id)).getUsername());
|
||||
|
|
@ -312,9 +362,10 @@ public class ProjectServiceImpl implements ProjectService {
|
|||
Integer page,
|
||||
Integer pageSize
|
||||
) {
|
||||
//获取用户
|
||||
//获取用户id
|
||||
Long userId = Processing.getAuthHeaderToUserId(request);
|
||||
|
||||
PageHelper.startPage(page, pageSize);
|
||||
List<ProjectDO> projectDOList = projectDAO.workget(userId, tags, isFinish, is);
|
||||
List<ProjectSimpleVO> projectSimpleVOList = new ArrayList<>();
|
||||
for (ProjectDO projectDO : projectDOList) {
|
||||
|
|
@ -323,12 +374,8 @@ public class ProjectServiceImpl implements ProjectService {
|
|||
projectSimpleVOList.add(projectSimpleVO1);
|
||||
}
|
||||
//分页返回
|
||||
int start = (page - 1) * pageSize;
|
||||
int end = start + pageSize;
|
||||
List<ProjectSimpleVO> pageData = projectSimpleVOList.subList(start,
|
||||
Math.min(end, projectSimpleVOList.size()));
|
||||
|
||||
return ResultUtil.success(pageData);
|
||||
PageInfo<ProjectSimpleVO> pageInfo = new PageInfo<>(projectSimpleVOList);
|
||||
return ResultUtil.success(pageInfo);
|
||||
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -341,6 +341,9 @@ public class Processing {
|
|||
projectSimpleVO.setTags(projectDO.getTags());
|
||||
projectSimpleVO.setCycle(projectDO.getCycle().longValue());
|
||||
projectSimpleVO.setWorkLoad(projectDO.getWorkLoad().longValue());
|
||||
projectSimpleVO.setFiles(projectDO.getFiles());
|
||||
projectSimpleVO.setStatus(projectDO.getStatus());
|
||||
projectSimpleVO.setDeadLine(projectDO.getDeadline());
|
||||
projectSimpleVO.setPrincipalUser(userDAO.getUserById(projectDO.getPrincipalId()).getUsername());
|
||||
// 解析JSON字符串
|
||||
JsonNode rootNode = null;
|
||||
|
|
|
|||
|
|
@ -151,7 +151,12 @@
|
|||
#{Finish}
|
||||
</foreach>
|
||||
</select>
|
||||
|
||||
<select id="getParticipateProject" resultType="com.jsl.oa.model.dodata.ProjectDO">
|
||||
select * from organize_oa.oa_project where id in
|
||||
(select project_id from organize_oa.oa_project_child where id in
|
||||
(select project_child_id from organize_oa.oa_project_modules
|
||||
where oa_project_modules.principal_id=#{userId} and is_delete=false) )
|
||||
</select>
|
||||
|
||||
|
||||
</mapper>
|
||||
|
|
@ -13,6 +13,8 @@ create table oa_project_child
|
|||
created_at timestamp default CURRENT_TIMESTAMP not null comment '创建时间',
|
||||
updated_at timestamp null comment '更新时间',
|
||||
is_delete tinyint(1) default 0 not null comment '项目是否删除',
|
||||
dead_line timestamp not null comment '子系统的截止时间',
|
||||
status varchar(8) default 'progress' not null comment '系统状态（draft: 草稿，progress: 进行，pause: 暂停，abnormal: 异常，complete: 完成）',
|
||||
constraint oa_project_child_oa_user_id_fk
|
||||
foreign key (principal_id) references oa_user (id)
|
||||
on update cascade
|
||||
|
|
|
|||
|
|
@ -11,6 +11,8 @@ create table oa_project_modules
|
|||
created_at timestamp default CURRENT_TIMESTAMP not null comment '创建时间',
|
||||
updated_at timestamp null comment '更新时间',
|
||||
is_delete tinyint(1) default 0 not null comment '项目是否删除',
|
||||
dead_line timestamp not null comment '子模块的截止时间',
|
||||
status varchar(8) default 'progress' not null comment '模块状态（draft: 草稿，progress: 进行，pause: 暂停，abnormal: 异常，complete: 完成）',
|
||||
constraint oa_project_modules_oa_user_id_fk
|
||||
foreign key (principal_id) references oa_user (id)
|
||||
on update cascade
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user