“djh”
2024-11-27 3c8e94af36e9f83485414f14a0e136e19c7a5137
修改
已修改5个文件
12 ■■■■ 文件已修改
exam-system/src/main/java/com/gkhy/exam/institutionalaccess/service/serviceImpl/TripartiteInterfaceServiceImpl.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
exam-system/src/main/resources/mapper/institutionaccess/ThCertMapper.xml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
exam-system/src/main/resources/mapper/institutionaccess/ThExamRecordMapper.xml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
exam-system/src/main/resources/mapper/institutionaccess/ThStudentBatchMapper.xml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
exam-system/src/main/resources/mapper/institutionaccess/ThStudyDetailMapper.xml 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
exam-system/src/main/java/com/gkhy/exam/institutionalaccess/service/serviceImpl/TripartiteInterfaceServiceImpl.java
@@ -556,7 +556,7 @@
        List<ThStudentBatch> updateThStudentBatchList = new ArrayList<>();
        for (ThStudentReqDTO studentReqDTO : saveStudentReqDTOList) {
            //学生表中过滤
            List<ThStudent> collect = students.stream().filter(s -> s.getIdcard().equals(studentReqDTO.getIdcard())).collect(Collectors.toList());
            List<ThStudent> collect = students.stream().filter(s -> s.getIdcard().equals(studentReqDTO.getIdcard()) && s.getInstitutionId().equals(institutionUser.getId()) ).collect(Collectors.toList());
            if(collect.size() > 0){
                ThStudent student = collect.get(0);
                //修改
exam-system/src/main/resources/mapper/institutionaccess/ThCertMapper.xml
@@ -7,7 +7,7 @@
        select a.*,b.batch_name  from th_cert a
        left join th_batch b on a.batch_uuid=b.uuid
        <where>
            and a.del_flag=0
            and a.del_flag=0 and b.del_flag =0
            <if test="institutionName!=null and institutionName!=''">
                 and a.institution_name =#{institutionName}
            </if>
exam-system/src/main/resources/mapper/institutionaccess/ThExamRecordMapper.xml
@@ -11,7 +11,7 @@
        LEFT JOIN th_student s ON s.idcard = e.idcard
        LEFT JOIN th_batch b ON b.uuid = e.batch_uuid
        WHERE
        e.del_flag = 0
        e.del_flag = 0 and s.del_flag = 0 and b.del_flag = 0
        <if test="query.idcard != null and query.idcard != ''">
            and e.idcard = #{query.idcard}
        </if>
exam-system/src/main/resources/mapper/institutionaccess/ThStudentBatchMapper.xml
@@ -123,7 +123,7 @@
    </update>
    <select id="getStudentBatchVOByBatchUuid" resultType="com.gkhy.exam.institutionalaccess.model.vo.ThStudentBatchVO">
        select sb.*, b.batch_lesson_num from th_student_batch sb INNER JOIN th_batch b ON sb.batch_uuid = b.uuid where sb.del_flag = 0 and sb.batch_uuid = #{batchUuid}
        select sb.*, b.batch_lesson_num from th_student_batch sb INNER JOIN th_batch b ON sb.batch_uuid = b.uuid where sb.del_flag = 0 and b.del_flag=0 and sb.batch_uuid = #{batchUuid}
    </select>
    <select id="getByIdCards" resultType="com.gkhy.exam.institutionalaccess.entity.ThStudentBatch" >
exam-system/src/main/resources/mapper/institutionaccess/ThStudyDetailMapper.xml
@@ -39,10 +39,10 @@
        </if>
        <if test="query.status == 0"></if>
        <if test="query.status == 1">
            and TIMESTAMPDIFF(SECOND, start_time, finish_time) = d.duration
            and (d.duration - TIMESTAMPDIFF(SECOND, start_time, finish_time)) &lt;= 30
        </if>
        <if test="query.status == 2">
            and TIMESTAMPDIFF(SECOND, start_time, finish_time) &lt; d.duration
            and (d.duration-TIMESTAMPDIFF(SECOND, start_time, finish_time)) &gt; 30
        </if>
        ORDER BY
        d.id DESC