|
@@ -1,10 +1,12 @@
|
|
|
package cn.com.qmth.stmms.biz.report.utils.module;
|
|
|
|
|
|
+import java.util.Comparator;
|
|
|
import java.util.HashMap;
|
|
|
import java.util.HashSet;
|
|
|
import java.util.List;
|
|
|
import java.util.Map;
|
|
|
import java.util.Set;
|
|
|
+import java.util.TreeSet;
|
|
|
|
|
|
import net.sf.json.JSONObject;
|
|
|
|
|
@@ -106,9 +108,16 @@ public class SubjectQuestionOptionModule implements Module {
|
|
|
for (String subjectCode : optionMap.keySet()) {
|
|
|
ReportSubject r = subjectService.findOne(this.context.getExamId(), subjectCode);
|
|
|
Set<String> options = optionMap.get(subjectCode);
|
|
|
-
|
|
|
options.remove(ANSWER);
|
|
|
- r.setOptions(StringUtils.join(options, ANSWER_SPLIT));
|
|
|
+ Set<String> sortSet = new TreeSet<String>(new Comparator<String>() {
|
|
|
+
|
|
|
+ @Override
|
|
|
+ public int compare(String o1, String o2) {
|
|
|
+ return o1.compareTo(o2);
|
|
|
+ }
|
|
|
+ });
|
|
|
+ sortSet.addAll(options);
|
|
|
+ r.setOptions(StringUtils.join(sortSet, ANSWER_SPLIT));
|
|
|
subjectService.save(r);
|
|
|
}
|
|
|
}
|