优化返回值

sexam/src/main/java/com/xhkjedu/sexam/service/paperstudent/EPaperStudentService.java

@@ -542,6 +542,9 @@ public class EPaperStudentService {
                     qmap.remove("mquestionid");
                     qmap.remove("mctype");
                     qmap.remove("questionpid");
+                    qmap.remove("mqanalyze");
+                    qmap.remove("mqanswer");
+                    qmap.remove("mqlevel");
 
                     mqlist.add(qmap);
                 } else {
@@ -574,11 +577,24 @@ public class EPaperStudentService {
                         }
                         mque.put("score", sontotalsocre);
                         mque.put("stuscore", stuscore);
+                        if (N_Utils.isNotEmpty(sque.get("mqanalyze"))) {
+                            mque.put("qanalyze", sque.get("mqanalyze").toString());
+                        } else {
+                            mque.put("qanalyze", "");
+                        }
+                        if (N_Utils.isNotEmpty(sque.get("mqanswer"))) {
+                            mque.put("qanswer", sque.get("mqanswer").toString());
+                        } else {
+                            mque.put("qanswer", "");
+                        }
 
                         for (Map sonquem : sonqueslist) {
                             sonquem.remove("mqstem");
                             sonquem.remove("mqoption");
-                            sonquem.remove("msum");
+                            sonquem.remove("msnum");
+                            sonquem.remove("mqanalyze");
+                            sonquem.remove("mqanswer");
+                            sonquem.remove("mqlevel");
                             sonquem.remove("mqtypeid");
                             sonquem.remove("mqtypename");
                             sonquem.remove("mhashear");

sexam/src/main/java/com/xhkjedu/sexam/service/report/EReportStudentService.java

@@ -240,6 +240,9 @@ public class EReportStudentService {
                 q.remove("mcomplexity");
                 q.remove("mctype");
                 q.remove("questionpid");
+                q.remove("mqanalyze");
+                q.remove("mqanswer");
+                q.remove("mqlevel");
                 rtnlist.add(q);
             } else {
                 //母题
@@ -266,9 +269,9 @@ public class EReportStudentService {
                         mq.put("qanalyze", "");
                     }
                     if (N_Utils.isNotEmpty(q.get("mqanswer"))) {
-                        mq.put("qanalyze", q.get("mqanswer").toString());
+                        mq.put("qanswer", q.get("mqanswer").toString());
                     } else {
-                        mq.put("qanalyze", "");
+                        mq.put("qanswer", "");
                     }
 
                     Integer hashear = Integer.parseInt(q.get("mhashear").toString());
@@ -292,10 +295,13 @@ public class EReportStudentService {
 
                     for(Map sonmap : sonqueslist){
                         sonmap.remove("mqstem");
-                        sonmap.remove("msum");
+                        sonmap.remove("msnum");
                         sonmap.remove("mqoption");
                         sonmap.remove("mqtypeid");
                         sonmap.remove("mqtypename");
+                        sonmap.remove("mqanalyze");
+                        sonmap.remove("mqanswer");
+                        sonmap.remove("mqlevel");
                         sonmap.remove("mhashear");
                         sonmap.remove("mhearfile");
                         sonmap.remove("mquestionid");