优化代码结构

wisenergy-model/src/main/java/cn/wisenergy/model/dto/AppletsPendApprovalDto.java

@@ -13,5 +13,7 @@ public class AppletsPendApprovalDto {
 
     private Date workDay;
 
+
+
     private List<WorkTimeOrderDto> workTimeOrderDto;
 }

wisenergy-model/src/main/java/cn/wisenergy/model/dto/ProjectDto.java

@@ -6,12 +6,14 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
 
 /**
  * @Authotr:陈奇
  * @QQ1799796883
  */
 @Data
+@Accessors(chain = true)
 @EqualsAndHashCode(callSuper = false)
 @ApiModel(value="ProjectDto", description="项目id和项目名实体类")
 public class ProjectDto {

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.AppletsPendApprovalDto;
-import cn.wisenergy.model.dto.CreateWorkOrderDto;
-import cn.wisenergy.model.dto.SubtotalDto;
-import cn.wisenergy.model.dto.WorkTimeOrderDto;
+import cn.wisenergy.model.dto.*;
 import com.github.pagehelper.PageInfo;
 
 import java.util.Date;
@@ -111,4 +108,11 @@ public interface WorkTimeOrderService {
      * @return dto
      */
     List<WorkTimeOrderDto> rejectNotSubmit(Integer userId);
+
+    /**
+     * 功能：获取用户参与的项目
+     * @param userId
+     * @return
+     */
+    List<ProjectDto> getProjectDto(Integer userId);
 }

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

@@ -250,6 +250,9 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
             wrapper.in("status", 1, 4);
             wrapper.eq("type", type);
             List<WorkTimeOrder> workTimeOrders = workTimeOrderMapper.selectList(wrapper);
+            if (CollectionUtils.isEmpty(workTimeOrders)) {
+                throw new BaseCustomException(BASE_RESP_CODE_ENUM.WORK_ORDER_END);
+            }
             return getDto(workTimeOrders);
         }
         return null;
@@ -387,6 +390,30 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
         return wtoToWtod(workTimeOrders);
     }
 
+    /**
+     * 功能：获取用户参与的项目
+     *
+     * @param userId
+     * @return
+     */
+    @Override
+    public List<ProjectDto> getProjectDto(Integer userId) {
+        log.info("WorkOrderServiceImpl[]getProjectDto[]input.param.id:{}" + userId);
+        if (null == userId) {
+            throw new BaseCustomException(BASE_RESP_CODE_ENUM.INPUT_PARAM_IS_NULL);
+        }
+        List<Integer> ids = workUserProjectService.getProjectIdByUserId(userId);
+        List<ProjectDto> list = workProjectService.getNameById(ids);
+        Integer deptId = workUserDeptService.getDeptIdByUserId(userId);
+        List<Integer> idsByDeptId = workUserDeptService.getUserIdsByDeptId(deptId);
+        WorkUser workUser = workUserService.getDeptManagerByIds(idsByDeptId);
+        list.add(new ProjectDto().setType(5).setProjectName(getTypeName(5)));
+        list.add(new ProjectDto().setType(6).setProjectName(getTypeName(6)));
+        list.add(new ProjectDto().setType(7).setProjectName(getTypeName(7)));
+        list.forEach(index -> index.setDeptManagerName(workUser.getName()));
+        return list;
+    }
+
     // workTimeOrder TO WorkTimeOrderDto
     private List<WorkTimeOrderDto> wtoToWtod(List<WorkTimeOrder> workTimeOrders) {
         List<WorkTimeOrderDto> dtos = new ArrayList<>();

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

@@ -5,8 +5,10 @@ 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.model.dto.AppletsPendApprovalDto;
+import cn.wisenergy.model.dto.CreateWorkOrderDto;
+import cn.wisenergy.model.dto.ProjectDto;
+import cn.wisenergy.model.dto.WorkTimeOrderDto;
 import cn.wisenergy.service.*;
 import cn.wisenergy.web.admin.controller.common.BaseController;
 import com.github.pagehelper.PageInfo;
@@ -131,12 +133,7 @@ public class WorkTimeOrderController extends BaseController {
         if (null == userId) {
             throw new CustomException(RESP_CODE_ENUM.INPUT_PARAM_IS_NULL);
         }
-        List<Integer> ids = workUserProjectService.getProjectIdByUserId(userId);
-        List<ProjectDto> list = workProjectService.getNameById(ids);
-        Integer deptId = workUserDeptService.getDeptIdByUserId(userId);
-        List<Integer> idsByDeptId = workUserDeptService.getUserIdsByDeptId(deptId);
-        WorkUser workUser = workUserService.getDeptManagerByIds(idsByDeptId);
-        list.forEach(index -> index.setDeptManagerName(workUser.getName()));
+        List<ProjectDto> list = workTimeOrderService.getProjectDto(userId);
         return getResult(list);
     }