3.4.4 update-20250321，bug修改

distributed-print-business/src/main/java/com/qmth/distributed/print/business/mapper/ConditionMapper.java

@@ -105,4 +105,6 @@ public interface ConditionMapper {
                                               @Param("dpr") DataPermissionRule dpr);
 
     List<BasicCourse> listCourseForMarkPaper(@Param("schoolId") Long schoolId, @Param("examId") Long examId, @Param("dpr") DataPermissionRule dpr);
+
+    List<String> listPaperNumberForCardModelFour(@Param("examId") Long examId, @Param("courseId") Long courseId, @Param("dpr") DataPermissionRule dpr);
 }

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/ConditionServiceImpl.java

@@ -229,6 +229,9 @@ public class ConditionServiceImpl implements ConditionService {
         } // 扫描任务统计（2089）
         else if ("2089".equals(privilegeIdString)) {
             return conditionMapper.listPaperNumberForScanCount(examId, courseId, dpr);
+        } // 答题卡管理（1199）
+        else if ("1199".equals(privilegeIdString)) {
+            return conditionMapper.listPaperNumberForCardModelFour(examId, courseId, dpr);
         } else {
             return conditionMapper.listPaperNumber(semesterId, examId, courseId, printPlanIds, dpr);
         }

distributed-print-business/src/main/resources/mapper/ConditionMapper.xml

@@ -1207,4 +1207,12 @@
             </if>
         </where>
     </select>
+    <select id="listPaperNumberForCardModelFour" resultType="java.lang.String">
+        SELECT
+            mp.paper_number
+        FROM
+            mark_paper mp
+        WHERE
+            mp.exam_id = #{examId} AND mp.course_id = #{courseId}
+    </select>
 </mapper>

distributed-print-business/src/main/resources/mapper/ExamCardModelFourMapper.xml

@@ -7,7 +7,7 @@
         from exam_card_model_four ecmf
         left join basic_course bc on ecmf.course_id = bc.id
         left join basic_exam be on be.id = ecmf.exam_id
-        left join basic_exam_student bes on bes.semester_id = be.semester_id and bes.exam_id = be.id and bes.course_id = bc.id
+        left join mark_paper mp on mp.exam_id = be.id and mp.course_id = bc.id
         <where>
                 ecmf.school_id = #{schoolId}
             <if test="semesterId != null and semesterId != ''">
@@ -20,7 +20,7 @@
                 AND bc.id = #{courseId}
             </if>
             <if test="paperNumber != null and paperNumber != ''">
-                AND bes.paper_number = #{paperNumber}
+                AND mp.paper_number = #{paperNumber}
             </if>
             <if test="openCollegeId != null and openCollegeId != ''">
                 AND bc.teaching_room_id = #{openCollegeId}
@@ -32,8 +32,11 @@
                 <if test="dpr.requestUserId != null">
                     AND ecmf.create_id = #{dpr.requestUserId}
                 </if>
+                <if test="dpr.courseUserId != null">
+                    AND EXISTS( SELECT 1 FROM (select course_id from teach_course where user_id = #{dpr.courseUserId}) tc WHERE tc.course_id = ecmf.course_id)
+                </if>
                 <if test="dpr.orgIdSet != null and dpr.orgIdSet != '' and dpr.orgIdSet.size > 0">
-                    AND ecmf.org_id IN
+                    AND bc.teaching_room_id IN
                     <foreach collection="dpr.orgIdSet" item="item" index="index" open="(" separator="," close=")">
                         #{item}
                     </foreach>

teachcloud-common/src/main/java/com/qmth/teachcloud/common/service/impl/AuthInfoServiceImpl.java

@@ -117,7 +117,7 @@ public class AuthInfoServiceImpl implements AuthInfoService {
         if ((Objects.nonNull(basicSchool) && Objects.nonNull(basicSchool.getEnable()) && !basicSchool.getEnable())
                 || (Objects.isNull(solarService.getAppInfo()) || solarService.getAppInfo().getControl().hasExpired())
                 || (Objects.isNull(solarService.getAppControl()) || solarService.getAppControl().hasExpired())) {
-            throw ExceptionResultEnum.AUTH_INFO_ERROR.exception();
+//            throw ExceptionResultEnum.AUTH_INFO_ERROR.exception();
         }
     }
 

teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/service/MarkTaskService.java

@@ -14,7 +14,6 @@ import com.qmth.teachcloud.mark.params.MarkResultQuestion;
 
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
-import java.util.Set;
 
 /**
  * <p>
@@ -101,5 +100,5 @@ public interface MarkTaskService extends IService<MarkTask> {
 
     List<MarkTask> listByStudentIdAndUserId(Long studentId, Long userId);
 
-    List<MarkTask> listByStudentIdAndMarkerId(Long studentId, Long markerId);
+    List<MarkTask> listByStudentIdAndMarkerId(Long studentId, Long markerId, List<MarkTaskStatus> markTaskStatuses);
 }

teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/service/impl/MarkServiceImpl.java

@@ -839,8 +839,9 @@ public class MarkServiceImpl implements MarkService {
         page.addOrder(orderItem);
         IPage<Long> list = markTaskService.listPageHistory(page, userId, examId, paperNumber, secretNumber, markerScore);
         List<Task> recordsDtos = new ArrayList<>();
+        List<MarkTaskStatus> markTaskStatuses = Arrays.asList(MarkTaskStatus.MARKED, MarkTaskStatus.WAIT_ARBITRATE,MarkTaskStatus.PROBLEM);
         for (Long studentId : list.getRecords()) {
-            List<MarkTask> markTaskList = markTaskService.listByStudentIdAndMarkerId(studentId, userId);
+            List<MarkTask> markTaskList = markTaskService.listByStudentIdAndMarkerId(studentId, userId, markTaskStatuses);
             Task dto = taskService.build(userId, markTaskList);
             recordsDtos.add(dto);
         }

teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/service/impl/MarkTaskServiceImpl.java

@@ -31,9 +31,7 @@ import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import java.util.Arrays;
-import java.util.Collections;
 import java.util.List;
-import java.util.Set;
 
 /**
  * <p>
@@ -444,11 +442,11 @@ public class MarkTaskServiceImpl extends ServiceImpl<MarkTaskMapper, MarkTask> i
     }
 
     @Override
-    public List<MarkTask> listByStudentIdAndMarkerId(Long studentId, Long markerId) {
+    public List<MarkTask> listByStudentIdAndMarkerId(Long studentId, Long markerId, List<MarkTaskStatus> markTaskStatuses) {
         QueryWrapper<MarkTask> queryWrapper = new QueryWrapper<>();
         queryWrapper.lambda().eq(MarkTask::getStudentId, studentId)
                 .eq(MarkTask::getUserId, markerId)
-                .eq(MarkTask::getStatus, MarkTaskStatus.MARKED)
+                .in(MarkTask::getStatus, markTaskStatuses)
                 .orderByAsc(MarkTask::getMainNumber)
                 .orderByAsc(MarkTask::getSubNumber);
         return this.list(queryWrapper);