Merge remote-tracking branch 'origin/master'

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

@@ -248,11 +248,8 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
         isManager(userId);
         WorkUser user = workUserService.getById(userId);
         // PC端
-        if (null != page && null != size) {
-            return pageExamine(user, projectId, type, page, size, status);
-        }
 
-        return null;
+        return pageExamine(user, projectId, type, page, size, status);
     }
 
     /**
@@ -689,7 +686,11 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
                 throw new BaseCustomException(BASE_RESP_CODE_ENUM.NO_JOIN_EVERY_PROJECT_PLASE_JION);
             }
             dto.setProjectName(null != dto.getProjectId() ? workProjectService.getById(dto.getProjectId()).getProjectName() : getTypeName(dto.getType()));
-
+            // 获取项目经理
+            if(null != dto.getProjectId())
+            dto.setProjectManagerName(workUserService.getById(workProjectService.getById(dto.getProjectId()).getManagerId()).getName());
+            // 获取类型名
+            dto.setTypeName(getTypeName(dto.getType()));
             // 获取部门id
             workTimeOrder.setDeptId(workUserDeptService.getDeptIdByUserId(dto.getUserId()));
             Date workDay = dto.getWorkDay();
@@ -711,6 +712,8 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
                 throw new BaseCustomException(BASE_RESP_CODE_ENUM.INSERT_DATA_IS_FAIL);
             }
             totalTime += workTimeOrder.getWorkTime();
+
+
         }
         WorkCollect workCollect = new WorkCollect();
         BeanUtils.copyProperties(list.get(0), workCollect);
@@ -727,9 +730,10 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
     // 审批分页
     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);
+        page = page == null ? 1 : page;
+        size = size == null ? 10 : size;
         PageHelper.startPage(page, size);
-        List<WorkTimeOrder> workTimeOrders;
-        workTimeOrders = null;
+        List<WorkTimeOrder> workTimeOrders = null;
         Integer level = user.getLevel();
         List<Integer> types;
         // 项目经理