Merge branch 'master' of http://49.234.186.218:9000/root/ieplus

back-ui/src/views/dz/papers/components/paper-exact-hand.vue

@@ -115,6 +115,9 @@ const handleStatClick = async (row, statType) => {
 }
 
 const handleSubmit = async (questions) => {
+    // 如果 questions 未定义，说明是从已生成试卷触发的，不需要处理
+    if (!questions) return
+    
     // validation
     if (!batchId.value) return ElMessage.error('请选择批次')
     if (!examType.value) return ElMessage.error('请选择考生类型')
@@ -128,6 +131,7 @@ const handleSubmit = async (questions) => {
     const paper = {
         buildType: type,
         batchId: toValue(batchId),
+        examType: toValue(examType),
         universityId: toValue(universityId),
         majorGroup: toValue(majorGroup),
         majorPlanId: toValue(majorPlanId),

back-ui/src/views/dz/papers/components/paper-full-hand.vue

@@ -105,6 +105,9 @@ const handleStatClick = async (row, statType) => {
 }
 
 const handleSubmit = async (questions) => {
+    // 如果 questions 未定义，说明是从已生成试卷触发的，不需要处理
+    if (!questions) return
+    
     // validation
     if (!batchId.value) return ElMessage.error('请选择批次')
     if (!examType.value) return ElMessage.error('请选择考生类型')

back-ui/src/views/dz/papers/components/plugs/built-paper-list.vue

@@ -24,8 +24,16 @@ const papers = ref([])
 const hasPaper = computed(() => !!papers.value?.length)
 
 const loadBuiltPaper = async function (payload) {
-    const res = await getBuiltPaper(payload)
-    papers.value = [].concat(res.data)
+    // 临时禁用全局 loading，避免显示遮罩
+    const originalLoading = loading.value
+    loading.value = false
+    try {
+        const res = await getBuiltPaper(payload)
+        papers.value = [].concat(res.data)
+    } finally {
+        // 恢复全局 loading 状态
+        loading.value = originalLoading
+    }
 }
 
 const reset = function () {

ie-system/src/main/resources/mapper/dz/DzClassesMapper.xml

@@ -101,7 +101,7 @@
     </select>
 
     <select id="selectClassesBuildStatsDetail" resultType="com.alibaba.fastjson2.JSONObject">
-        SELECT 
+        SELECT distinct
             u.`nick_name` AS studentName,
             CONCAT(u.`nick_name`, '-', IFNULL(u.`phonenumber`, '')) AS namePhone,
             IFNULL(card.`card_no`, '') AS cardNo,
@@ -141,8 +141,8 @@
             <choose>
                 <!-- send: 组卷已完成 -->
                 <when test="statType == 'send'">
-                    AND ls.`major_plan_id` IS NOT NULL 
-                    AND ts.`student_id` IS NOT NULL 
+                    AND ls.`major_plan_id` IS NOT NULL
+                    AND ts.`student_id` IS NOT NULL
                     AND ts.`status` = 4
                 </when>
                 <!-- total: 班级人数 -->
@@ -155,13 +155,13 @@
                 </when>
                 <!-- unfinish: 组卷未完成 -->
                 <when test="statType == 'unfinish'">
-                    AND ls.`major_plan_id` IS NOT NULL 
-                    AND ts.`student_id` IS NOT NULL 
+                    AND ls.`major_plan_id` IS NOT NULL
+                    AND ts.`student_id` IS NOT NULL
                     AND ts.`status` != 4
                 </when>
                 <!-- unsend: 定向未组卷 -->
                 <when test="statType == 'unsend'">
-                    AND ls.`major_plan_id` IS NOT NULL 
+                    AND ls.`major_plan_id` IS NOT NULL
                     AND ts.`student_id` IS NULL
                 </when>
             </choose>
@@ -215,7 +215,7 @@
 
     <select id="selectDzClassesBySchoolIds" resultMap="DzClassesResult">
         <include refid="selectDzClassesVo"/>
-        where t1.school_id in 
+        where t1.school_id in
         <foreach collection="schoolIds" item="schoolId" open="(" separator="," close=")">
             #{schoolId}
         </foreach>

sql/add_indexes_for_learn_dz.sql

@@ -317,3 +317,4 @@ CREATE INDEX idx_dz_select_subject_rank ON dz_select_subject(rank);
 
 
 
+

sql/add_study_time_indexes.sql

@@ -16,3 +16,4 @@ CREATE INDEX IF NOT EXISTS idx_customer_video_watches_time ON b_customer_video_w
 
 
 
+