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

sstudy/src/main/java/com/xhkjedu/sstudy/service/question/ZQuestionUpdateService.java

@@ -58,13 +58,14 @@ public class ZQuestionUpdateService {
         }
         for (TSubject s : subjects) {
             List<TSubjectQuestiontype> qtypelist = zQuestionUpdateMapper.listSubjectQtype(s.getLevel(), s.getSubjectid());
-            Map<Integer, TSubjectQuestiontype> tmap = new TreeMap();
+            Map<String, TSubjectQuestiontype> tmap = new TreeMap();
             if (N_Utils.isListEmpty(qtypelist)) {
                 throw new Exception(s.getSubjectname() + "未设置题型");
             }
             for (TSubjectQuestiontype t : qtypelist) {
-                if(!tmap.containsKey(t.getCtype())){
-                    tmap.put(t.getCtype(), t);
+                String key = t.getCtype() + "_"+t.getQtypename();
+                if(!tmap.containsKey(key)){
+                    tmap.put(key, t);
                 }
             }
 
@@ -110,12 +111,14 @@ public class ZQuestionUpdateService {
                 q.setSchoolid(qvo.getSchoolid());
                 TSubjectQuestiontype st = null;
                 if (qvo.getCtype() == 7 || qvo.getCtype() == 8) {
-                    st = tmap.get(16);
+                    String sckey = "16_"+qvo.getQtypename();
+                    st = tmap.get(sckey);
                     q.setCtype(16);
 
                 }
                 if (qvo.getCtype() == 10) {
-                    st = tmap.get(17);
+                    String sckey = "17_"+qvo.getQtypename();
+                    st = tmap.get(sckey);
                     q.setCtype(17);
                 }
 
@@ -148,7 +151,19 @@ public class ZQuestionUpdateService {
                     td.setCreatetime(timestamp);
                     directors.add(td);
                 }
+                
+                String key1 = "1_单选题";
+                String key2 = "1_选择题";
+                TSubjectQuestiontype sonqtype = null;
+                if(tmap.containsKey(key1)){
+                    sonqtype = tmap.get(key1);
+                }else if(tmap.containsKey(key2)){
+                    sonqtype = tmap.get(key2);
+                }
 
+                if (sonqtype == null) {
+                    throw new Exception("科目下无单选题题型：" + s.getSubjectname() + ";试题id：" + qvo.getQuestionid());
+                }
 
                 for (int i = 0; i < optionlist.size(); i++) {
                     Map map = optionlist.get(i);
@@ -184,10 +199,9 @@ public class ZQuestionUpdateService {
                     sq.setBelong(qvo.getBelong());
                     sq.setSchoolid(qvo.getSchoolid());
 
-                    TSubjectQuestiontype st1 = tmap.get(1);
                     sq.setCtype(1);
-                    sq.setQtypeid(st1.getQtypeid());
-                    sq.setQtypename(st1.getQtypename());
+                    sq.setQtypeid(sonqtype.getQtypeid());
+                    sq.setQtypename(sonqtype.getQtypename());
 
                     questions.add(sq);
                 }