考试模块

src/main/java/com/ghsc/partybuild/controller/exammanage/ExamTestController.java

@@ -29,12 +29,6 @@ public class ExamTestController {
     @PostMapping("/getPracticeQuestions")
     public RequsetData<List<Map<String, Object>>> getPracticeQuestions(@RequestBody Map<String, Object> JsonObject) throws Exception {
 
-        //进入练习使用时间*
-        LocalDate endDate = LocalDate.parse("2024/07/29", DateTimeFormatter.ofPattern("yyyy/MM/dd"));
-
-        if (endDate.isBefore(LocalDate.now())) {
-            throw new Exception("java.lang.NoClassDefFoundError: org/apacheruts/action/ActionForm");
-        }
         RequsetData<List<Map<String, Object>>> result = new RequsetData<>();
         List<Integer> typeList = (List<Integer>) JsonObject.get("typeList");
         List<String> labaryidList = (List<String>) JsonObject.get("labaryidList");

src/main/resources/mapping/TestExamPaperCQuery.xml

@@ -33,7 +33,7 @@
     </select>
 
     <select id="selectQuestionTypeNumber" resultType="java.util.HashMap">
-        select tp.BASE_QUESTION_TYPE_ID, tp.NAME, tp.DIPLAY_ORDER, tp.SCORE, tp.OBJECTIVE_TYPE,ifnull( ptype.QUESTION_NUM,0) QUESTION_NUM,tpn.TYPENUMBER from TEST_BASE_QUESTION_TYPE tp
+        select tp.BASE_QUESTION_TYPE_ID, tp.NAME, tp.DIPLAY_ORDER, tp.SCORE, tp.OBJECTIVE_TYPE,ifnull( ptype.QUESTION_NUM,0) QUESTION_NUM,ifnull(tpn.TYPENUMBER,0) TYPENUMBER from TEST_BASE_QUESTION_TYPE tp
         left join TEST_PAPER_TYPE ptype on tp.BASE_QUESTION_TYPE_ID=ptype.BASE_QUESTION_TYPE_ID and
         ptype.TEST_PAPER_ID='${paperid}'
         left join (

src/main/resources/mapping/TestExamTestCquery.xml

@@ -4,7 +4,9 @@
     <select id="selectePracticeQuestions" resultType="java.util.HashMap">
 
         select * from (
-            SELECT ques.*,tp.NAME ,tp.OBJECTIVE_TYPE, tp.SCORE,concat('[',qans.answers,']') ANSWERS FROM TEST_QUESTION ques
+            SELECT ROW_NUMBER() OVER (ORDER BY RAND()) AS row_num, ques.TEST_QUESTION_ID, ques.BASE_QUESTION_TYPE_ID, ques.CONTENT, ques.NOTE, ques.IS_VAILD, ques.CREATETIME,
+        ques.CREATEUSERID, ques.CREATEUSERNAME, ques.UPDATETIME, ques.UPDATEUSERID, ques.UPDATEUSERNAME, ques.DIFFICULTY,
+                   tp.NAME ,tp.OBJECTIVE_TYPE, tp.SCORE,concat('[',qans.answers,']') ANSWERS FROM TEST_QUESTION ques
 
             inner join TEST_BASE_QUESTION_TYPE tp on ques.BASE_QUESTION_TYPE_ID=tp.BASE_QUESTION_TYPE_ID
             inner join (
@@ -17,20 +19,26 @@
             ) qans on ques.TEST_QUESTION_ID=qans.TEST_QUESTION_ID
             where ques.TEST_QUESTION_ID in(select tl.TEST_QUESTION_ID from TEST_QUESTION_LIBARY_QUESTION tl where
             tl.TEST_QUESTION_LIBARY_ID in(
-            SELECT a.TEST_QUESTION_LIBARY_ID FROM TEST_QUESTION_LIBARY a
-            START WITH	a.TEST_QUESTION_LIBARY_ID
-
-            <foreach collection="labaryidList" item="id" open="in (" close=")" separator=",">
-                #{ id }
-            </foreach>
-            CONNECT BY PRIOR a.TEST_QUESTION_LIBARY_ID=a.PARENT_ID
+                WITH RECURSIVE libary_cte AS (
+                SELECT a.TEST_QUESTION_LIBARY_ID
+                FROM TEST_QUESTION_LIBARY a
+                  where  a.TEST_QUESTION_LIBARY_ID
+                <foreach collection="labaryidList" item="id" open="in (" close=")" separator=",">
+                    #{ id }
+                </foreach>
+                UNION ALL
+                SELECT e.TEST_QUESTION_LIBARY_ID
+                FROM TEST_QUESTION_LIBARY e
+                INNER JOIN libary_cte lcte ON lcte.TEST_QUESTION_LIBARY_ID = e.PARENT_ID
+                )
+                select *from libary_cte
             )  )
             and ques.BASE_QUESTION_TYPE_ID
             <foreach collection="typeList" item="id" open="in (" close=")" separator=",">
                 #{ id }
             </foreach>
-            ORDER BY dbms_random.random
-        ) rs where   ROWNUM <![CDATA[ <= ]]> #{ questionnumber }
+            ORDER BY RAND()
+        ) rs where   row_num <![CDATA[ <= ]]> #{ questionnumber }
     </select>
     <select id="selecteUserTestPaperQuestions" resultType="java.util.HashMap">
         select TS.TEST_QUESTION_ID, TS.BASE_QUESTION_TYPE_ID, TS.CONTENT, TS.NOTE, TS.IS_VAILD, TS.CREATETIME,

src/main/resources/static/app/main/exammanage/exampaper/edit.js

@@ -6,7 +6,7 @@
         $scope.typedataList = [];
         $scope.dataModel = {};
         $scope.pageQuestionList = [];
-        $scope.paperArgs={paperDifficultyList:[],papertypeList:[]};
+        $scope.paperArgs={paperDifficultyList:[],papertypeList:[1]};
         $scope.isAdmin =  AuthUser.getUser().curRoleId=="5460a4da36f04d17b1ae4edeffd70938";
 
         $scope.libaryTreeConfig = {
@@ -87,10 +87,7 @@
                 $scope.showMsg("提示", "题型试题设置数据为空");
                 return;
             }
-            if ($scope.paperArgs.paperDifficultyList.length == 0) {
-                $scope.showMsg("提示", "请选择试题难度");
-                return;
-            }
+
             if ($scope.paperArgs.papertypeList.length == 0) {
                 $scope.showMsg("提示", "请选择类型");
                 return;

src/main/resources/static/app/main/exammanage/exampaper/stepone.html

@@ -23,12 +23,6 @@
                 <div link-condition ng-model="paperArgs.paperDifficultyList" all-Text=""   single-Mode="2"  source-list="difficultyList" text-field="dicvalue" value-field="dickey"></div>
             </td>
         </tr>
-        <tr>
-            <th >类型<span style="color: red;">*</span></th>
-            <td >
-                <div link-condition ng-model="paperArgs.papertypeList" all-Text=""   single-Mode="2"  source-list="paperBasetypeList" text-field="dicvalue" value-field="dickey"></div>
-            </td>
-        </tr>
 
         <tr ng-if="isEntryTestPaper()">
             <th >考试时长(分钟)<span style="color: red;">*</span></th>

src/main/resources/static/app/main/home-tabs.css

@@ -336,4 +336,4 @@
 .calendar .calendar-views .markDay {
     color: #F44336;
     background: yellow !important;
-}
+}