优化代码结构

wisenergy-model/src/main/java/cn/wisenergy/model/app/WorkLevel.java

@@ -25,8 +25,11 @@ public class WorkLevel {
     private Integer rank;
 
 
+    @ApiModelProperty(name = "icon",value = "图标")
+    private String icon;
     /**附加字段*/
     @TableField(exist = false)
     private String path;
 
+
 }

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

 package cn.wisenergy.model.dto;
 
+import cn.wisenergy.model.app.WorkType;
 import lombok.Data;
 
 import java.util.List;
@@ -15,4 +16,6 @@ public class ProjectsDto {
 
     private List<ProjectManagerDto> projectManagerDto;
 
+    private List<WorkType> workTypes;
+
 }

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

@@ -61,6 +61,7 @@ public class WorkTimeOrderDto {
     @ApiModelProperty(name = "isOvertime", value = "0:正常工时，1：加班")
     private Integer isOvertime;
 
+    @JsonFormat(shape=JsonFormat.Shape.STRING,pattern = "yyyy-MM-dd")
     @ApiModelProperty(name = "rejectTime",value = "驳回时间")
     private Date rejectTime;
 

wisenergy-model/src/main/java/cn/wisenergy/model/enums/LevelEnum.java

@@ -5,7 +5,7 @@ package cn.wisenergy.model.enums;
  * @QQ1799796883
  */
 public enum LevelEnum {
-    EXAMINE("审批","/index"),
+    EXAMINE("工时审批","/index"),
     STATISTICS("统计","/statistical"),
     PROJECT_MANAGER( "项目/商机管理","/projects"),
     TIMEEXPORT("工时导出","/export"),

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

@@ -535,9 +535,14 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
         }
         ProjectsDto projectsDto = new ProjectsDto();
         WorkUser user = workUserService.getById(userId);
-        // 1.获取可填报的项目
+        // 1.获取可填报的类型
+        List<WorkType> workTypes = workTypeService.getAll();
+        if (!CollectionUtils.isEmpty(workTypes)) {
+            projectsDto.setWorkTypes(workTypes);
+        }
+        // 2.获取可填报的项目
         projectsDto.setProjectInfoDto(getProjectInfoDto(userId));
-        // 2.获取可审批的项目
+        // 3.获取可审批的项目
         List<UserRoleLevelDto> roleUserLevel = UserRoleLevelUtils.getRoleUserLevel(userId);
         if (CollectionUtils.isEmpty(roleUserLevel)) {
             return projectsDto;