更新

olive-console/src/main/java/com/zrqx/olive/project/controller/ProjectController.java

@@ -16,6 +16,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.common.CheckAdminToken;
+import com.common.CommonPage;
 import com.common.CommonResult;
 import com.common.PageParamRequest;
 import com.github.pagehelper.PageInfo;
@@ -129,9 +130,8 @@ public class ProjectController {
 	
 	@ApiOperation(value = "分页查询" , notes ="分页查询")
 	@GetMapping(value = "/page" )
-	public CommonResult<PageInfo<ProjectListVo>> query(QueryProjectRequest form, PageParamRequest pageParamRequest){
-		PageInfo<ProjectListVo> list = service.page(form, pageParamRequest);
-		return CommonResult.success(list);
+	public CommonResult<CommonPage<ProjectListVo>> query(QueryProjectRequest form, PageParamRequest pageParamRequest){
+		return CommonResult.success(CommonPage.restPage(service.page(form, pageParamRequest)));
 	}
 	
 	@ApiOperation(value = "查询项目" , notes ="查询项目")

olive-console/src/main/java/com/zrqx/olive/project/service/impl/StatisticsProjectServiceImpl.java

@@ -13,8 +13,10 @@ import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.common.CommonPage;
 import com.common.PageParamRequest;
 import com.enums.ProjectStatusEnum;
+import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.utils.DateUtils;
@@ -58,12 +60,12 @@ public class StatisticsProjectServiceImpl extends ServiceImpl<StatisticsProjectD
 	private TaskService taskService;
 	@Override
 	public PageInfo<ProjectListVo> page(QueryProjectRequest form, PageParamRequest pageParamRequest) {
+		//开启分页
 		if(pageParamRequest.getOrderBy()==null) {
-			pageParamRequest.setOrderBy("px desc");
+			pageParamRequest.setOrderBy("px desc,upload_time desc");
 		}
-		//开启分页
-		PageHelper.startPage(pageParamRequest.getPage(), pageParamRequest.getLimit());
-		
+		Page<StatisticsProject> startPage = PageHelper.startPage(pageParamRequest.getPage(), pageParamRequest.getLimit(),
+				pageParamRequest.getOrderBy());
 		List<ProjectListVo> list = mapper.queryProjectPage(form);
 		for (ProjectListVo projectListVo : list) {
 			Customer customer = dao.selectById(projectListVo.getCustomerId());
@@ -86,7 +88,7 @@ public class StatisticsProjectServiceImpl extends ServiceImpl<StatisticsProjectD
 				}
 			}
 		}
-		return new PageInfo<ProjectListVo>(list);
+		return CommonPage.copyPageInfo(startPage, list);
 	}
 
 	@Override