优化代码结构

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

@@ -18,4 +18,6 @@ public class ProjectsDto {
 
     private List<WorkType> workTypes;
 
+    private List<WorkType> workTypeList;
+
 }

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

@@ -544,6 +544,9 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
         }
         ProjectsDto projectsDto = new ProjectsDto();
         WorkUser user = workUserService.getById(userId);
+        // 逻辑删后的东西
+        List<WorkType> workTypeList = workTypeService.getByIsDelete(1, 0);
+        projectsDto.setWorkTypeList(workTypeList);
         // 1.获取可填报的类型
         List<WorkType> workTypes = workTypeService.getAll(1);
         if (!CollectionUtils.isEmpty(workTypes)) {