bug修复

teachcloud-report-business/src/main/java/com/qmth/teachcloud/report/business/bean/result/InspectCollegeResult.java

@@ -1,6 +1,10 @@
 package com.qmth.teachcloud.report.business.bean.result;
 
 import com.qmth.teachcloud.common.annotation.ExcelProperty;
+import com.qmth.teachcloud.report.business.enums.SemesterEnum;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.util.Objects;
 
 /**
  * @Date: 2021/6/8.
@@ -9,35 +13,56 @@ public class InspectCollegeResult {
 
     @ExcelProperty(name = "学期", width = 30, index = 1)
     private String semester;
+
     @ExcelProperty(name = "考试名称", width = 30, index = 2)
     private String examName;
-    @ExcelProperty(name = "课程代码", width = 30, index = 3)
+    @ApiModelProperty(value = "科目编码")
     private String courseCode;
-    @ExcelProperty(name = "课程名称", width = 30, index = 4)
+    @ApiModelProperty(value = "科目名称")
     private String courseName;
-    @ExcelProperty(name = "准考证号", width = 30, index = 5)
+
+    @ExcelProperty(name = "课程(代码)", width = 40, index = 3)
+    private String courseNameCode;
+
+    @ExcelProperty(name = "准考证号", width = 30, index = 4)
     private String ticketNumber;
-    @ExcelProperty(name = "学号", width = 30, index = 6)
+    @ExcelProperty(name = "学号", width = 30, index = 5)
     private String studentCode;
-    @ExcelProperty(name = "姓名", width = 30, index = 7)
+    @ExcelProperty(name = "姓名", width = 30, index = 6)
     private String name;
     private Boolean current;
-    @ExcelProperty(name = "考试类型", width = 30, index = 8)
+    @ExcelProperty(name = "考试类型", width = 30, index = 7)
     private String currentStr;
-    @ExcelProperty(name = "总分", width = 30, index = 9)
+    @ExcelProperty(name = "总分", width = 30, index = 8)
     private Integer assignedScore;
     private String clazzCode;
-    @ExcelProperty(name = "班级", width = 30, index = 10)
+    @ExcelProperty(name = "班级", width = 30, index = 9)
     private String clazzName;
-    @ExcelProperty(name = "开课学院", width = 30, index = 11)
+    @ExcelProperty(name = "开课学院", width = 30, index = 10)
     private String teachCollegeName;
-    @ExcelProperty(name = "考查学院", width = 30, index = 12)
+    @ExcelProperty(name = "考查学院", width = 30, index = 11)
     private String inspectCollegeName;
-    @ExcelProperty(name = "任课老师", width = 30, index = 13)
+    @ExcelProperty(name = "任课老师", width = 30, index = 12)
     private String teacherName;
 
+    public String getCourseNameCode() {
+        if (Objects.nonNull(courseCode) && Objects.nonNull(courseName)) {
+            return courseName + "(" + courseCode + ")";
+        } else {
+            return courseNameCode;
+        }
+    }
+
+    public void setCourseNameCode(String courseNameCode) {
+        this.courseNameCode = courseNameCode;
+    }
+
     public String getSemester() {
-        return semester;
+        if (Objects.nonNull(semester)) {
+            return SemesterEnum.valueOf(semester).getTitle();
+        } else {
+            return semester;
+        }
     }
 
     public void setSemester(String semester) {

teachcloud-report-business/src/main/java/com/qmth/teachcloud/report/business/bean/result/TeachCollegeResult.java

@@ -2,6 +2,8 @@ package com.qmth.teachcloud.report.business.bean.result;
 
 import com.qmth.teachcloud.common.annotation.ExcelProperty;
 import com.qmth.teachcloud.common.contant.SystemConstant;
+import com.qmth.teachcloud.report.business.enums.SemesterEnum;
+import io.swagger.annotations.ApiModelProperty;
 
 import java.math.BigDecimal;
 import java.util.Objects;
@@ -13,41 +15,51 @@ public class TeachCollegeResult {
 
     @ExcelProperty(name = "学期", width = 30, index = 1)
     private String semester;
+
     @ExcelProperty(name = "考试名称", width = 30, index = 2)
     private String examName;
-    @ExcelProperty(name = "课程代码", width = 30, index = 3)
+
+    @ApiModelProperty(value = "科目编码")
     private String courseCode;
-    @ExcelProperty(name = "课程名称", width = 30, index = 4)
+
+    @ApiModelProperty(value = "科目名称")
     private String courseName;
-    @ExcelProperty(name = "准考证号", width = 30, index = 5)
+    @ExcelProperty(name = "课程(代码)", width = 40, index = 3)
+    private String courseNameCode;
+
+    @ExcelProperty(name = "准考证号", width = 30, index = 4)
     private String ticketNumber;
-    @ExcelProperty(name = "学号", width = 30, index = 6)
+    @ExcelProperty(name = "学号", width = 30, index = 5)
     private String studentCode;
-    @ExcelProperty(name = "姓名", width = 30, index = 7)
+    @ExcelProperty(name = "姓名", width = 30, index = 6)
     private String name;
     private Boolean current;
-    @ExcelProperty(name = "考试类型", width = 30, index = 8)
+    @ExcelProperty(name = "考试类型", width = 30, index = 7)
     private String currentStr;
-    @ExcelProperty(name = "客观总分", width = 30, index = 9)
+    @ExcelProperty(name = "客观总分", width = 30, index = 8)
     private BigDecimal objectiveScore;
-    @ExcelProperty(name = "主观总分", width = 30, index = 10)
+    @ExcelProperty(name = "主观总分", width = 30, index = 9)
     private BigDecimal subjectiveScore;
-    @ExcelProperty(name = "卷面总分", width = 30, index = 11)
+    @ExcelProperty(name = "卷面总分", width = 30, index = 10)
     private BigDecimal totalScore;
-    @ExcelProperty(name = "赋分总分", width = 30, index = 12)
+    @ExcelProperty(name = "赋分总分", width = 30, index = 11)
     private BigDecimal assignedScore;
     private String clazzCode;
-    @ExcelProperty(name = "班级", width = 30, index = 13)
+    @ExcelProperty(name = "班级", width = 30, index = 12)
     private String clazzName;
-    @ExcelProperty(name = "开课学院", width = 30, index = 14)
+    @ExcelProperty(name = "开课学院", width = 30, index = 13)
     private String teachCollegeName;
-    @ExcelProperty(name = "考查学院", width = 30, index = 15)
+    @ExcelProperty(name = "考查学院", width = 30, index = 14)
     private String inspectCollegeName;
-    @ExcelProperty(name = "任课老师", width = 30, index = 16)
+    @ExcelProperty(name = "任课老师", width = 30, index = 15)
     private String teacherName;
 
     public String getSemester() {
-        return semester;
+        if (Objects.nonNull(semester)) {
+            return SemesterEnum.valueOf(semester).getTitle();
+        } else {
+            return semester;
+        }
     }
 
     public void setSemester(String semester) {
@@ -70,6 +82,18 @@ public class TeachCollegeResult {
         this.courseCode = courseCode;
     }
 
+    public String getCourseNameCode() {
+        if (Objects.nonNull(courseCode) && Objects.nonNull(courseName)) {
+            return courseName + "(" + courseCode + ")";
+        } else {
+            return courseNameCode;
+        }
+    }
+
+    public void setCourseNameCode(String courseNameCode) {
+        this.courseNameCode = courseNameCode;
+    }
+
     public String getCourseName() {
         return courseName;
     }

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

@@ -149,16 +149,6 @@ public class TBExamStudentServiceImpl extends ServiceImpl<TBExamStudentMapper, T
         } else {
             listPage = tbExamStudentMapper.listTeachCollegeResult(page, schoolId, semester, examId, courseCode, current, inspectCollegeId, orgId, teacherId, studentParam, Objects.nonNull(sysUser.getOrgId()) ? Arrays.asList(sysUser.getOrgId()) : null, column, 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;
     }
 
@@ -239,18 +229,7 @@ public class TBExamStudentServiceImpl extends ServiceImpl<TBExamStudentMapper, T
     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());
         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);
-        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;
+        return tbExamStudentMapper.listInspectCollegeResult(page, schoolId, semester, examId, courseCode, current, teachCollegeId, teacherId, studentParam, column, Objects.nonNull(order) ? order.name() : null);
     }
 
     @Override