Merge remote-tracking branch 'origin/dev_v2.1.0' into dev_v2.1.0

# Conflicts:
#	teachcloud-report-business/src/main/java/com/qmth/teachcloud/report/business/mapper/TBExamStudentMapper.java
#	teachcloud-report-business/src/main/java/com/qmth/teachcloud/report/business/service/impl/TBExamStudentServiceImpl.java

teachcloud-report-business/src/main/java/com/qmth/teachcloud/report/business/mapper/TBExamStudentMapper.java

@@ -93,13 +93,11 @@ public interface TBExamStudentMapper extends BaseMapper<TBExamStudent> {
      * @param teachCollegeId
      * @param teacherId
      * @param studentParam
-     * @param column
-     * @param order
      * @return
      */
-    IPage<InspectCollegeResult> listInspectCollegeResult(@Param("page") Page<InspectCollegeResult> page, @Param("schoolId") Long schoolId, @Param("semester") String semester, @Param("examId") Long examId, @Param("courseCode") String courseCode, @Param("current") Boolean current, @Param("teachCollegeId") Long teachCollegeId, @Param("teacherId") Long teacherId, @Param("studentParam") String studentParam, @Param("column") String column, @Param("order") String order);
+    IPage<InspectCollegeResult> listInspectCollegeResult(@Param("page") Page<InspectCollegeResult> page, @Param("schoolId") Long schoolId, @Param("semester") String semester, @Param("examId") Long examId, @Param("courseCode") String courseCode, @Param("current") Boolean current, @Param("teachCollegeId") Long teachCollegeId,@Param("inspectCollegeId") Long inspectCollegeId, @Param("teacherId") Long teacherId, @Param("studentParam") String studentParam);
 
-    List<InspectCollegeResult> listInspectCollegeResult(@Param("schoolId") Long schoolId, @Param("semester") String semester, @Param("examId") Long examId, @Param("courseCode") String courseCode, @Param("current") Boolean current, @Param("teachCollegeId") Long teachCollegeId, @Param("teacherId") Long teacherId, @Param("studentParam") String studentParam, @Param("column") String column, @Param("order") String order);
+    List<InspectCollegeResult> listInspectCollegeResult(@Param("schoolId") Long schoolId, @Param("semester") String semester, @Param("examId") Long examId, @Param("courseCode") String courseCode, @Param("current") Boolean current, @Param("teachCollegeId") Long teachCollegeId, @Param("teacherId") Long teacherId, @Param("studentParam") String studentParam);
 
     /**
      * 学生报告预览-列表接口

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

@@ -21,6 +21,7 @@ import com.qmth.teachcloud.report.business.bean.result.*;
 import com.qmth.teachcloud.report.business.entity.*;
 import com.qmth.teachcloud.report.business.enums.AssignEnum;
 import com.qmth.teachcloud.report.business.enums.OrderEnum;
+import com.qmth.teachcloud.report.business.enums.SemesterEnum;
 import com.qmth.teachcloud.report.business.mapper.*;
 import com.qmth.teachcloud.report.business.service.TBExamStudentService;
 import org.apache.commons.lang3.StringUtils;
@@ -152,11 +153,23 @@ public class TBExamStudentServiceImpl extends ServiceImpl<TBExamStudentMapper, T
         } else {
             finalColumn = SystemConstant.getOrderColumn(column);
         }
+        IPage<TeachCollegeResult> listPage;
         if (Objects.nonNull(collegeIds) && collegeIds.size() > 0) {
-            return tbExamStudentMapper.listTeachCollegeResult(page, schoolId, semester, examId, courseCode, current, inspectCollegeId, orgId, teacherId, studentParam, collegeIds, finalColumn, Objects.nonNull(order) ? order.name() : null);
+            listPage = tbExamStudentMapper.listTeachCollegeResult(page, schoolId, semester, examId, courseCode, current, inspectCollegeId, orgId, teacherId, studentParam, collegeIds, finalColumn, Objects.nonNull(order) ? order.name() : null);
         } else {
-            return tbExamStudentMapper.listTeachCollegeResult(page, schoolId, semester, examId, courseCode, current, inspectCollegeId, orgId, teacherId, studentParam, Arrays.asList(sysUser.getOrgId()), finalColumn, Objects.nonNull(order) ? order.name() : null);
+            listPage = tbExamStudentMapper.listTeachCollegeResult(page, schoolId, semester, examId, courseCode, current, inspectCollegeId, orgId, teacherId, studentParam, Arrays.asList(sysUser.getOrgId()), finalColumn, Objects.nonNull(order) ? order.name() : null);
         }
+        for (TeachCollegeResult record : listPage.getRecords()) {
+            String tmp = record.getSemester();
+            String result = "";
+            for (SemesterEnum value : SemesterEnum.values()) {
+                if (tmp.equals(String.valueOf(value))){
+                    result = value.getTitle();
+                }
+            }
+            record.setSemester(result);
+        }
+        return listPage;
     }
 
     @Override
@@ -238,15 +251,27 @@ public class TBExamStudentServiceImpl extends ServiceImpl<TBExamStudentMapper, T
     @Override
     public IPage<InspectCollegeResult> listInspectCollegeResult(String semester, Long examId, String courseCode, Boolean current, Long teachCollegeId, Long teacherId, String studentParam, Integer pageNumber, Integer pageSize, String column, OrderEnum order) {
         Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
+        SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
+        Long inspectCollegeId = sysUser.getOrgId();
         Page<InspectCollegeResult> page = new Page<>(pageNumber, pageSize);
-        IPage<InspectCollegeResult> listPage = tbExamStudentMapper.listInspectCollegeResult(page, schoolId, semester, examId, courseCode, current, teachCollegeId, teacherId, studentParam, column, Objects.nonNull(order) ? order.name() : null);
+        IPage<InspectCollegeResult> listPage = tbExamStudentMapper.listInspectCollegeResult(page, schoolId, semester, examId, courseCode, current, teachCollegeId,inspectCollegeId, teacherId, studentParam);
+        for (InspectCollegeResult record : listPage.getRecords()) {
+            String tmp = record.getSemester();
+            String result = "";
+            for (SemesterEnum value : SemesterEnum.values()) {
+                if (tmp.equals(String.valueOf(value))){
+                    result = value.getTitle();
+                }
+            }
+            record.setSemester(result);
+        }
         return listPage;
     }
 
     @Override
     public void exportInspectCollegeResult(String semester, Long examId, String courseCode, Boolean current, Long teachCollegeId, Long teacherId, String studentParam, HttpServletResponse response, String column, OrderEnum order) throws Exception {
         Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
-        List<InspectCollegeResult> list = tbExamStudentMapper.listInspectCollegeResult(schoolId, semester, examId, courseCode, current, teachCollegeId, teacherId, studentParam, column, Objects.nonNull(order) ? order.name() : null);
+        List<InspectCollegeResult> list = tbExamStudentMapper.listInspectCollegeResult(schoolId, semester, examId, courseCode, current, teachCollegeId, teacherId, studentParam);
         ExcelUtil.excelExport("开课成绩查询", TeachCollegeResult.class, list, response);
     }
 

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

@@ -199,6 +199,9 @@
             <if test="teachCollegeId != null">
                 and a.teach_college_id = #{teachCollegeId}
             </if>
+            <if test="inspectCollegeId != null">
+                and a.inspect_college_id = #{inspectCollegeId}
+            </if>
             <if test="teacherId != null">
                 and a.teacher_id = #{teacherId}
             </if>