尝试增加排序返回
parent
6eb7c68a18
commit
0a12db6dfe
|
@ -2,6 +2,7 @@ package cn.edu.hfut.rmdjzz.projectmanagement.controller;
|
|||
|
||||
import cn.edu.hfut.rmdjzz.projectmanagement.entity.Project;
|
||||
import cn.edu.hfut.rmdjzz.projectmanagement.entity.ResultProject;
|
||||
import cn.edu.hfut.rmdjzz.projectmanagement.entity.SortEntity;
|
||||
import cn.edu.hfut.rmdjzz.projectmanagement.service.IProjectService;
|
||||
import cn.edu.hfut.rmdjzz.projectmanagement.utils.http.ResponseList;
|
||||
import cn.edu.hfut.rmdjzz.projectmanagement.utils.http.ResponseMap;
|
||||
|
@ -19,6 +20,7 @@ import java.util.Map;
|
|||
/**
|
||||
* @author 佘语殊
|
||||
* @since 2022/6/30 11:24
|
||||
* <!TODO>
|
||||
*/
|
||||
@RestController
|
||||
@RequestMapping("/project")
|
||||
|
@ -39,8 +41,10 @@ public class ProjectController {
|
|||
@RequestParam("pageSize") Integer pageSize,
|
||||
@RequestParam("pageCurrent") Integer pageCurrent,
|
||||
@RequestParam("paramMap") Map<String, Object> paramMap
|
||||
) {
|
||||
Page<ResultProject> page = projectService.getOnePageProject(token, pageCurrent, pageSize, paramMap);
|
||||
//@RequestParam("sort") SortEntity sortEntity
|
||||
) {
|
||||
SortEntity sortEntity = new SortEntity();
|
||||
Page<ResultProject> page = projectService.getOnePageProject(token, pageCurrent, pageSize, paramMap, sortEntity);
|
||||
return ResponseList.ofSuccess("成功返回列表", page);
|
||||
}
|
||||
|
||||
|
|
|
@ -8,6 +8,7 @@ import lombok.Data;
|
|||
|
||||
import java.math.BigDecimal;
|
||||
import java.time.LocalDate;
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
/**
|
||||
* @author 阳勇权
|
||||
|
@ -43,4 +44,5 @@ public class Project {
|
|||
@TableLogic
|
||||
private Boolean deleted;
|
||||
private Integer projectCreator;
|
||||
private LocalDateTime projectCreateTime;
|
||||
}
|
||||
|
|
|
@ -0,0 +1,26 @@
|
|||
package cn.edu.hfut.rmdjzz.projectmanagement.entity;
|
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import com.baomidou.mybatisplus.core.metadata.OrderItem;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* @author 阳勇权
|
||||
* @since 2022/7/4 9:25
|
||||
*/
|
||||
@Data
|
||||
public class SortEntity {
|
||||
String sortName;
|
||||
Boolean ascOrder;
|
||||
|
||||
public <T> Page<T> sortPage(Page<T> page) {
|
||||
if(ascOrder == null) return page;
|
||||
if (ascOrder) {
|
||||
return page.addOrder(OrderItem.asc(sortName));
|
||||
} else {
|
||||
return page.addOrder(OrderItem.desc(sortName));
|
||||
}
|
||||
}
|
||||
}
|
|
@ -2,6 +2,7 @@ package cn.edu.hfut.rmdjzz.projectmanagement.service;
|
|||
|
||||
import cn.edu.hfut.rmdjzz.projectmanagement.entity.Project;
|
||||
import cn.edu.hfut.rmdjzz.projectmanagement.entity.ResultProject;
|
||||
import cn.edu.hfut.rmdjzz.projectmanagement.entity.SortEntity;
|
||||
import cn.edu.hfut.rmdjzz.projectmanagement.exception.BadRequestException;
|
||||
import cn.edu.hfut.rmdjzz.projectmanagement.exception.TokenException;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
|
@ -17,7 +18,7 @@ public interface IProjectService extends IService<Project> {
|
|||
|
||||
Long getAllProjectOfStaff(String token) throws TokenException;
|
||||
|
||||
Page<ResultProject> getOnePageProject(String token, Integer pageCurrent, Integer pageSize, Map<String, Object> params) throws TokenException;
|
||||
Page<ResultProject> getOnePageProject(String token, Integer pageCurrent, Integer pageSize, Map<String, Object> params, SortEntity sortEntity) throws TokenException;
|
||||
|
||||
Boolean setProjectCompleted(String token, Integer projectId) throws TokenException, BadRequestException;
|
||||
|
||||
|
|
|
@ -2,6 +2,7 @@ package cn.edu.hfut.rmdjzz.projectmanagement.service.impl;
|
|||
|
||||
import cn.edu.hfut.rmdjzz.projectmanagement.entity.Project;
|
||||
import cn.edu.hfut.rmdjzz.projectmanagement.entity.ResultProject;
|
||||
import cn.edu.hfut.rmdjzz.projectmanagement.entity.SortEntity;
|
||||
import cn.edu.hfut.rmdjzz.projectmanagement.exception.BadRequestException;
|
||||
import cn.edu.hfut.rmdjzz.projectmanagement.exception.TokenException;
|
||||
import cn.edu.hfut.rmdjzz.projectmanagement.mapper.ProjectMapper;
|
||||
|
@ -40,11 +41,12 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
|
|||
String token,
|
||||
Integer pageCurrent,
|
||||
Integer pageSize,
|
||||
Map<String, Object> params
|
||||
Map<String, Object> params,
|
||||
SortEntity sortEntity
|
||||
) throws TokenException {
|
||||
Integer staffId = TokenUtils.getStaffId(token);
|
||||
IPage<ResultProject> page = new Page<>(pageCurrent, pageSize);
|
||||
IPage<ResultProject> userPage = baseMapper.findMyProject(page, staffId, WrapperUtils.allEqAndTimeIntervalQueryWrapper(params));
|
||||
Page<ResultProject> page = new Page<>(pageCurrent, pageSize);
|
||||
IPage<ResultProject> userPage = baseMapper.findMyProject(sortEntity.sortPage(page), staffId, WrapperUtils.allEqAndTimeIntervalQueryWrapper(params));
|
||||
return (Page<ResultProject>) userPage;
|
||||
}
|
||||
|
||||
|
@ -71,6 +73,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
|
|||
public Boolean createProject(String token, Project project) throws TokenException, BadRequestException {
|
||||
project.setProjectId(null);
|
||||
project.setCompleted(false);
|
||||
project.setProjectCreateTime(null);
|
||||
project.setProjectCreator(TokenUtils.getStaffId(token));
|
||||
project.setProjectCloseTime(null);
|
||||
if (project.getExpectedCompletion() == null) {
|
||||
|
|
Loading…
Reference in New Issue