明细导出

src/main/java/com/xjrsoft/common/enums/CourseTimeTypeEnum.java

@@ -46,12 +46,12 @@ public enum CourseTimeTypeEnum {
     }
 
     public static String[] getCodes() {
-        String[] codes = {"CTT001", "CTT002", "CTT003", "CTT004", "CTT005", "周末培优"};
+        String[] codes = {"CTT001", "CTT002", "CTT003", "CTT004", "CTT005", "CTT006"};
         return codes;
     }
 
     public static String[] getValues() {
-        String[] values = {"教研会", "督导听课", "临近三年退休政策", "出题", "阅卷", "CTT006"};
+        String[] values = {"教研会", "督导听课", "临近三年退休政策", "出题", "阅卷", "周末培优"};
         return values;
     }
 }

src/main/java/com/xjrsoft/module/classtime/service/impl/ClassTimeStatisticsServiceImpl.java

@@ -53,6 +53,7 @@ import java.util.Arrays;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -160,7 +161,7 @@ public class ClassTimeStatisticsServiceImpl extends MPJBaseServiceImpl<ClassTime
 
             //费用设置jsonArray
             JsonArray costSetArray = parser.parse(statistics.getCostSetJson()).getAsJsonArray();
-            Map<String, Double> costSetMap = new HashMap<>();
+            Map<String, Double> costSetMap = new LinkedHashMap<>();
             for (JsonElement jsonElement : costSetArray) {
                 JsonObject object = jsonElement.getAsJsonObject();
                 costSetMap.put(object.get("field").getAsString(), object.get("value").getAsDouble());
@@ -168,7 +169,7 @@ public class ClassTimeStatisticsServiceImpl extends MPJBaseServiceImpl<ClassTime
 
             //权重设置jsonArray
             JsonArray weightSetArray = parser.parse(statistics.getWeightSetJson()).getAsJsonArray();
-            Map<String, Double> weightSetMap = new HashMap<>();
+            Map<String, Double> weightSetMap = new LinkedHashMap<>();
             for (JsonElement jsonElement : weightSetArray) {
                 JsonObject object = jsonElement.getAsJsonObject();
                 weightSetMap.put(object.get("label").getAsString(), object.get("value").getAsDouble());