优化代码结构

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

@@ -283,16 +283,7 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
             if (2 == dto.getStatus() || 5 == dto.getStatus()) {
                 continue;
             }
-            /*// 修改
-            if (null != dto.getWorkId()) {
-                workTimeOrderMapper.updateToNull(dto.getWorkId());
-                workTimeOrderMapper.updateById(workTimeOrder);
-            }
-            // 插入
-            if (null == dto.getWorkId() || 0 == dto.getWorkId()) {
-                workTimeOrderMapper.save(workTimeOrder);
-                dto.setWorkId(workTimeOrder.getWorkId());
-            }*/
+
             BeanUtils.copyProperties(workTimeOrder, dto);
             addList.add(workTimeOrder);
         }
@@ -675,14 +666,7 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
         return projectList;
     }
 
-    // project转ProjectDto
-    private ProjectDto projectToProjectDto(WorkProject workProject) {
-        ProjectDto projectDto = new ProjectDto();
-        BeanUtils.copyProperties(workProject, projectDto);
-        // 获取项目管理
-        projectDto.setManagerName(workUserService.getById(workProject.getManagerId()).getName());
-        return projectDto;
-    }
+
 
     // workTimeOrder TO WorkTimeOrderDto
     public List<WorkTimeOrderDto> wtoToWtod(List<WorkTimeOrder> workTimeOrders) {
@@ -740,8 +724,9 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
         if (null == dto.getWorkTime() || 0 == dto.getWorkTime()) {
             size++;
         }
-        if (1 == dto.getType() || 2 == dto.getType() && null == dto.getProjectId()) {
-            size++;
+        if (1 == dto.getType() || 2 == dto.getType()) {
+            if (null == dto.getProjectId())
+                size++;
         }
         if (null == dto.getDes() || "".equals(dto.getDes())) {
             size++;
@@ -762,8 +747,9 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
         if (thanDate(dto.getWorkDay())) {
             throw new BaseCustomException(BASE_RESP_CODE_ENUM.WORK_TIME_OVER_NOW_DAY);
         }
-        if (1 == dto.getType() || 2 == dto.getType() && null == dto.getProjectId()) {
-            throw new BaseCustomException(BASE_RESP_CODE_ENUM.NO_JOIN_EVERY_PROJECT_PLASE_JION);
+        if (1 == dto.getType() || 2 == dto.getType()) {
+            if (null == dto.getProjectId())
+                throw new BaseCustomException(BASE_RESP_CODE_ENUM.WORK_TIME_OVER_NOW_DAY);
         }
         for (ProjectTypeEnum value : ProjectTypeEnum.values()) {
             if (value.getReviewer() == 2) {
@@ -853,7 +839,8 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
             // 获取用户名
             dto.setUserName(workUserService.getById(dto.getUserId()).getName());
             // 获取项目名
-            if ((PROJECT.equals(dto.getType()) || BUSINESS_OPPORTUNITY.equals(dto.getType())) && null == dto.getProjectId()) {
+            if ((PROJECT.equals(dto.getType()) || BUSINESS_OPPORTUNITY.equals(dto.getType())) ) {
+                if(null == dto.getProjectId())
                 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()));
@@ -937,25 +924,13 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
                 }
             }
             for (WorkProject workProject : workProjects) {
-                if (null !=workTimeOrderDto.getProjectId()&&workTimeOrderDto.getProjectId().equals(workProject.getId())) {
+                if (null != workTimeOrderDto.getProjectId() && workTimeOrderDto.getProjectId().equals(workProject.getId())) {
                     workTimeOrderDto.setProjectName(workProject.getProjectName());
                 }
             }
             workTimeOrderDto.setTypeName(getTypeName(workTimeOrderDto.getType()));
             workTimeOrderDtos.add(workTimeOrderDto);
         }
-
-      /*  for (WorkTimeOrder workTimeOrder : workTimeOrders) {
-            WorkTimeOrderDto workTimeOrderDto = new WorkTimeOrderDto();
-            BeanUtils.copyProperties(workTimeOrder, workTimeOrderDto);
-            workTimeOrderDto.setUserName(workUserService.getById(workTimeOrder.getUserId()).getName());
-            if (null != workTimeOrder.getProjectId()) {
-                workTimeOrderDto.setProjectName(workProjectService.getById(workTimeOrder.getProjectId()).getProjectName());
-            }
-            workTimeOrderDto.setTypeName(getTypeName(workTimeOrderDto.getType()));
-            workTimeOrderDtos.add(workTimeOrderDto);
-        }*/
-
         return new PageInfo<>(workTimeOrderDtos);
     }