Merge branch 'dev_v2.1.0' into release_v2.1.0

merge

teachcloud-report-business/src/main/java/com/qmth/teachcloud/report/business/service/impl/TBExamCourseServiceImpl.java

@@ -124,8 +124,11 @@ public class TBExamCourseServiceImpl extends ServiceImpl<TBExamCourseMapper, TBE
         SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
         List<Long> collegeIds = sysOrgService.findCollegeIds(sysUser.getOrgId());
         AuthBean authBean = cacheService.userAuthCache(sysUser.getId());
+        //院长开课学院不过滤，学校管理员不过滤，(院长考查学院过滤，教务老师过滤)
         boolean filter = true;
-        if (Objects.nonNull(authBean) && Objects.nonNull(authBean.getRoleList()) && authBean.getRoleList().get(0).getType() == RoleTypeEnum.SCHOOL_ADMIN && inspect) {
+        if (Objects.nonNull(authBean) && Objects.nonNull(authBean.getRoleList()) && authBean.getRoleList().get(0).getType() == RoleTypeEnum.SCHOOL_ADMIN) {
+            filter = false;
+        } else if (Objects.nonNull(authBean) && Objects.nonNull(authBean.getRoleList()) && authBean.getRoleList().get(0).getType() == RoleTypeEnum.PRESIDENT && !inspect) {
             filter = false;
         }
         if (Objects.nonNull(collegeIds) && collegeIds.size() > 0) {

teachcloud-report-business/src/main/java/com/qmth/teachcloud/report/business/templete/service/impl/TaskCalculateServiceImpl.java

@@ -3,6 +3,7 @@ package com.qmth.teachcloud.report.business.templete.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.qmth.teachcloud.common.contant.SystemConstant;
 import com.qmth.teachcloud.report.business.entity.TBPaper;
+import com.qmth.teachcloud.report.business.enums.AssignEnum;
 import com.qmth.teachcloud.report.business.service.AnalyzeForReportService;
 import com.qmth.teachcloud.report.business.service.TBExamService;
 import com.qmth.teachcloud.report.business.service.TBPaperService;
@@ -39,6 +40,7 @@ public class TaskCalculateServiceImpl implements TaskCalculateService {
                 .eq(TBPaper::getExamId, examId).eq(TBPaper::getCourseCode, courseCode));
         for (TBPaper tbPaper : tbPaperList) {
             tbPaper.setCoefficient(coefficient);
+            tbPaper.setScoreType(AssignEnum.NEED_ASSIGN_SCORE);
         }
         tbPaperService.updateBatchById(tbPaperList);
         analyzeForReportService.normalAssignScore(examId,tbExamService.getById(examId).getSchoolId(),courseCode);

teachcloud-report-business/src/main/resources/mapper/TBExamCourseMapper.xml

@@ -10,15 +10,15 @@
         <choose>
             <when test="inspect != null and inspect == true">
                 so.id = tbs.inspect_college_id and tbs.absent = 0
-                <if test="filter != null and filter == true">
-                    join t_b_exam_course tbec on
-                        tbec.course_code = bc.code
-                </if>
             </when>
             <otherwise>
                 so.id = tbs.teach_college_id
             </otherwise>
         </choose>
+        <if test="filter != null and filter == true">
+            join t_b_exam_course tbec on
+            tbec.course_code = bc.code
+        </if>
         <where>
             <if test="examId != null and examId != ''">
                 and tbs.exam_id = #{examId}
@@ -39,7 +39,7 @@
                     #{collegeId}
                 </foreach>
             </if>
-            <if test="inspect != null and inspect == true and filter != null and filter == true">
+            <if test="filter != null and filter == true">
                 and tbec.publish_status = 'PUBLISH'
             </if>
         </where>