Merge remote-tracking branch 'origin/master' into ywx

sexam/src/main/java/com/xhkjedu/sexam/service/paper/EPaperQtypeService.java

@@ -369,17 +369,17 @@ public class EPaperQtypeService {
         List<Map> ranglist = new ArrayList<>();
         Map zgmap = new HashMap();
         zgmap.put("qtname","主观题");
-        zgmap.put("score","zscore");
-        zgmap.put("num","znum");
-        zgmap.put("srate","zscorerate");
-        zgmap.put("nrate","znumrate");
+        zgmap.put("score",zscore);
+        zgmap.put("num",znum);
+        zgmap.put("srate",zscorerate);
+        zgmap.put("nrate",znumrate);
         ranglist.add(zgmap);
         Map kgmap = new HashMap();
         kgmap.put("qtname","客观题");
-        kgmap.put("score","kscore");
-        kgmap.put("num","knum");
-        kgmap.put("srate","kscorerate");
-        kgmap.put("nrate","knumrate");
+        kgmap.put("score",kscore);
+        kgmap.put("num",knum);
+        kgmap.put("srate",kscorerate);
+        kgmap.put("nrate",knumrate);
         ranglist.add(kgmap);
 
         Map ztmap = new HashMap<>();