zhangying 1 неделя назад
Родитель
Сommit
0fd46ac8cf

+ 1 - 1
src/main/java/com/ghsc/partybuild/controller/exammanage/ExamPaperController.java

@@ -103,7 +103,7 @@ public class ExamPaperController {
         RequsetData<Map<String, Object>> result = new RequsetData<>();
         Map<String, Object> paper=new HashMap<>();
         TestPaper dataModel = examPaperService.getTestPaper(paperid);
-        List<TestPaperLibary> libaryList = examPaperService. selectPaperLibaryList(paperid);
+        List<TestPaperLibary> libaryList = examPaperService.selectPaperLibaryList(paperid);
         List<String> labaryidList=  libaryList.stream().map(x->x.getTestQuestionLibaryId()).collect(Collectors.toList());
         List<TestPaperDifficulty> difficultyList = examPaperService.selectPaperDifficultyList(paperid);
         List<Integer> difficultyidList=  difficultyList.stream().map(x->x.getDifficulty()).collect(Collectors.toList());

+ 4 - 0
src/main/java/com/ghsc/partybuild/service/impl/CheckDataServiceImpl.java

@@ -114,6 +114,10 @@ public class CheckDataServiceImpl implements CheckDataService {
         ckExp.or().andNameidIn(nameIdList);
         checknamelistMapper.deleteByExample(ckExp);
 
+        PtCheckdataExample cdExp = new PtCheckdataExample();
+        cdExp.or().andDataidIn(nameIdList);
+        CheckdataMapper.deleteByExample(cdExp);
+
         return 1;
     }
 

+ 14 - 3
src/main/java/com/ghsc/partybuild/service/impl/exammanage/ExamPaperServiceImpl.java

@@ -96,8 +96,13 @@ public class ExamPaperServiceImpl implements ExamPaperService {
         labaryidList.add(UUID.randomUUID().toString());
         List<Map<String, Object>> list = this.testExamPaperCQuery.selectTakeQuestions(labaryidList, typeList, difficultyList);
         list.forEach(x -> {
-
-            x.put("ANSWERS", JSON.parseObject(JSON.toJSONString(JSON.parse(x.get("ANSWERS").toString())), List.class));
+            Clob clob = (Clob) x.get("ANSWERS");
+            String clobString = null;
+            try {
+                clobString = clob.getSubString(1, (int) clob.length());
+            } catch (SQLException e) { }
+            List answers = JSON.parseObject(clobString, List.class);
+            x.put("ANSWERS", answers);
         });
         return list;
     }
@@ -230,7 +235,13 @@ public class ExamPaperServiceImpl implements ExamPaperService {
 
         List<Map<String, Object>> list = this.testExamPaperCQuery.selectPaparQuestionList(paperid);
         list.forEach(x -> {
-            x.put("ANSWERS", JSON.parseObject(JSON.toJSONString(JSON.parse(x.get("ANSWERS").toString())), List.class));
+            Clob clob = (Clob) x.get("ANSWERS");
+            String clobString = null;
+            try {
+                clobString = clob.getSubString(1, (int) clob.length());
+            } catch (SQLException e) { }
+            List answers = JSON.parseObject(clobString, List.class);
+            x.put("ANSWERS", answers);
         });
         return list;
     }

+ 7 - 5
src/main/resources/mapping/TestExamPaperCQuery.xml

@@ -40,11 +40,13 @@
         select ts.BASE_QUESTION_TYPE_ID,count(1) typeNumber
         from TEST_QUESTION ts
         where ts.IS_VAILD = 1
-        and ts.TEST_QUESTION_ID in(select tl.TEST_QUESTION_ID from TEST_QUESTION_LIBARY_QUESTION tl where
-        tl.TEST_QUESTION_LIBARY_ID
-        <foreach collection="labaryidList" item="id" open="in (" close=")" separator=",">
-            #{ id }
-        </foreach>
+        and ts.TEST_QUESTION_ID in(select tl.TEST_QUESTION_ID from TEST_QUESTION_LIBARY_QUESTION tl where 1=1
+        <if test="labaryidList!=null">
+            and tl.TEST_QUESTION_LIBARY_ID
+            <foreach collection="labaryidList" item="id" open="in (" close=")" separator=",">
+                #{ id }
+            </foreach>
+        </if>
         )
         <if test="difficultyList !=null">
             and ts.difficulty

+ 1 - 1
src/main/resources/static/app/main/newsMgr/module/manage.js

@@ -287,7 +287,7 @@
             $scope.hasPermission.show = true;
             $scope.newMenu = {
                 moduleid: $uuid.getUUID(),
-                parentmenuid: null, // 顶级目录默认取NULL
+                parentmenuid: "", // 顶级目录默认取NULL
                 menuorder: "",
                 menuname: "",
                 menudesc: "",