优化代码结构

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

@@ -7,6 +7,8 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.io.Serializable;
+
 /**
  * @Authotr:陈奇
  * @QQ1799796883
@@ -14,7 +16,11 @@ import lombok.EqualsAndHashCode;
 @Data
 @EqualsAndHashCode(callSuper = false)
 @ApiModel(value="WorkType", description="项目类型类")
-public class WorkType {
+public class WorkType implements Serializable, Comparable{
+
+    private final static Integer[] TYPE_ORDER = {1, 2, 5, 6, 7, 3, 4};
+    private static final long serialVersionUID = 8842083047098059912L;
+
     @ApiModelProperty(name = "id",value = "主键id")
     @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
@@ -24,4 +30,21 @@ public class WorkType {
 
     @ApiModelProperty(name = "reviewer",value = "检查者:1:该项目负责人 2:系统自动 3:部门或中心负责人")
     private Integer reviewer;
+
+
+    @Override
+    public int compareTo(Object o) {
+        WorkType workType = (WorkType) o;
+        int thisI = 0;
+        int oI = 0;
+        for (int i = 0; i < TYPE_ORDER.length; i++) {
+            if (id.equals(TYPE_ORDER[i])) {
+                thisI = i;
+            }
+            if (workType.getId().equals(TYPE_ORDER[i])) {
+                oI = i;
+            }
+        }
+        return thisI - oI;
+    }
 }

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

@@ -541,7 +541,6 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
         if (!CollectionUtils.isEmpty(workTypes)) {
             projectsDto.setWorkTypes(workTypes);
         }
-
         // 2.获取可填报的项目
         projectsDto.setProjectInfoDto(getProjectInfoDto(userId));
         // 3.获取可审批的项目

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

@@ -11,6 +11,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
 
+import java.util.Collections;
 import java.util.List;
 
 /**
@@ -33,6 +34,7 @@ public class WorkTypeServiceImpl implements WorkTypeService {
         if (CollectionUtils.isEmpty(workTypes)) {
             return null;
         }
+        Collections.sort(workTypes);
         return workTypes;
     }