优化代码结构

wisenergy-service/src/main/java/cn/wisenergy/service/WorkTimeOrderService.java

 package cn.wisenergy.service;
 
 import cn.wisenergy.model.app.WorkTimeOrder;
-import cn.wisenergy.model.dto.*;
+import cn.wisenergy.model.dto.AppletsPendApprovalDto;
+import cn.wisenergy.model.dto.CreateWorkOrderDto;
+import cn.wisenergy.model.dto.SubtotalDto;
+import cn.wisenergy.model.dto.WorkTimeOrderDto;
+import com.github.pagehelper.PageInfo;
 
 import java.util.Date;
 import java.util.List;
@@ -70,7 +74,7 @@ public interface WorkTimeOrderService {
      * @param status    状态
      * @return 自定义dto
      */
-    PageResult<ExamineGroupbyProjectDto> getExamine(Integer userId, Integer projectId, Integer type, Integer page, Integer size, Integer status);
+    PageInfo<WorkTimeOrder> getExamine(Integer userId, Integer projectId, Integer type, Integer page, Integer size, Integer status);
 
     /**
      *  功能：获取小程序待审批

wisenergy-service/src/main/java/cn/wisenergy/service/impl/WorkTimeOrderServiceImpl.java

@@ -205,7 +205,7 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
      * @return 自定义dto
      */
     @Override
-    public PageResult<ExamineGroupbyProjectDto> getExamine(Integer userId, Integer projectId, Integer type, Integer page, Integer size, Integer status) {
+    public  PageInfo<WorkTimeOrder> getExamine(Integer userId, Integer projectId, Integer type, Integer page, Integer size, Integer status) {
         log.info("WorkOrderServiceImpl[]getExamine[]input.param.userId:{},projectId:{},type:{},page:{},size:{},status:{}" + userId, projectId, type, page, size, status);
         // 判断当前用户是否是管理员
         isManager(userId);
@@ -569,15 +569,13 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
 
 
     // 审批分页
-    private PageResult<ExamineGroupbyProjectDto> pageExamine(WorkUser user, Integer projectId, Integer type, Integer page, Integer size, Integer status) {
+    private PageInfo<WorkTimeOrder> pageExamine(WorkUser user, Integer projectId, Integer type, Integer page, Integer size, Integer status) {
         log.info("WorkOrderServiceImpl[]pageExamine[]input.param.user:{},projectId:{},type:{},page:{},size:{},status:{}" + user, projectId, type, page, size, status);
         PageHelper.startPage(page, size);
         List<WorkTimeOrder> workTimeOrders;
         workTimeOrders = null;
         Integer level = user.getLevel();
         List<Integer> types;
-        PageResult<ExamineGroupbyProjectDto> pageResult = new PageResult<>();
-
         // 项目经理
         if (1 == level) {
             types = type == null ? Arrays.asList(1, 2, 3, 4) : new ArrayList<>(type);
@@ -589,8 +587,8 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
             workTimeOrders = workTimeOrderMapper.queryByPage(status, null, types);
         }
         PageInfo<WorkTimeOrder> pageInfo = new PageInfo<>(workTimeOrders);
-        pageResult.setTotal(pageInfo.getTotal());
-        return pageResult.setRows(WorkTimeOrderTOEGPD(workTimeOrders));
+
+        return pageInfo;
     }
 
 

wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/WorkTimeOrderController.java

@@ -4,10 +4,12 @@ import cn.wisenergy.common.utils.DateUtil;
 import cn.wisenergy.common.utils.exception.CustomException;
 import cn.wisenergy.common.utils.exception.RESP_CODE_ENUM;
 import cn.wisenergy.common.utils.exception.Result;
+import cn.wisenergy.model.app.WorkTimeOrder;
 import cn.wisenergy.model.app.WorkUser;
 import cn.wisenergy.model.dto.*;
 import cn.wisenergy.service.*;
 import cn.wisenergy.web.admin.controller.common.BaseController;
+import com.github.pagehelper.PageInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -111,13 +113,13 @@ public class WorkTimeOrderController extends BaseController {
             @ApiImplicitParam(name = "status", value = "PC端审批状态", dataType = "int"),
     })
     @GetMapping(value = "/getExamine")
-    public Result<PageResult<ExamineGroupbyProjectDto>> getExamine(Integer userId, Integer projectId, Integer type, Integer page, Integer size, Integer status) {
+    public Result<PageInfo<WorkTimeOrder>> getExamine(Integer userId, Integer projectId, Integer type, Integer page, Integer size, Integer status) {
         log.info("WorkTimeOrderController[]getExamine[]input.param.userId:{},projectId:{},type:{},page:{},size:{},status:{}" + userId, projectId, type, page, size, status);
         if (null == userId) {
             throw new CustomException(RESP_CODE_ENUM.INPUT_PARAM_IS_NULL);
         }
-        PageResult<ExamineGroupbyProjectDto> examines = workTimeOrderService.getExamine(userId, projectId, type, page, size, status);
-        return getResult(examines);
+        PageInfo<WorkTimeOrder> examine = workTimeOrderService.getExamine(userId, projectId, type, page, size, status);
+        return getResult(examine);
     }