日常更新

teachcloud-report-business/src/main/java/com/qmth/teachcloud/report/business/bean/dto/excel/TAExamCourseDto.java

@@ -1,9 +1,11 @@
 package com.qmth.teachcloud.report.business.bean.dto.excel;
 
 import com.qmth.teachcloud.common.annotation.ExcelProperty;
+import io.swagger.annotations.ApiModelProperty;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
+import java.util.Objects;
 
 /**
  * @Description: TAExamCourseDto
@@ -21,7 +23,7 @@ public class TAExamCourseDto implements Serializable {
     private String teachCollegeName;
 
     @ExcelProperty(name = "考查学院", width = 30, index = 3)
-    private String inspectCollegeName;
+    private Integer inspectCollegeCount;
 
     @ExcelProperty(name = "有效人数", width = 30, index = 4)
     private Integer realityCount;
@@ -47,28 +49,67 @@ public class TAExamCourseDto implements Serializable {
     @ExcelProperty(name = "应届不及格率(人数)", width = 50, index = 11)
     private String currentNotPassRate;
 
-    public TAExamCourseDto() {
+    @ApiModelProperty(value = "科目编码")
+    private String courseCode;
 
+    @ApiModelProperty(value = "科目名称")
+    private String courseName;
+
+    @ApiModelProperty(value = "应届实际考试人数")
+    private Integer currentRealityCount;
+
+    @ApiModelProperty(value = "不通过人数")
+    private Integer notPassCount;
+
+    @ApiModelProperty(value = "应届不通过人数")
+    private Integer currentNotPassCount;
+
+    public Integer getNotPassCount() {
+        return notPassCount;
     }
 
-    public TAExamCourseDto(String courseCodeName, String teachCollegeName, String inspectCollegeName, Integer realityCount,
-                           String currentRealityRate, String pastRealityRate, BigDecimal avgScore, String notPassRate,
-                           Integer absentCount, BigDecimal paperCurrentAvgScore, String currentNotPassRate) {
-        this.courseCodeName = courseCodeName;
-        this.teachCollegeName = teachCollegeName;
-        this.inspectCollegeName = inspectCollegeName;
-        this.realityCount = realityCount;
-        this.currentRealityRate = currentRealityRate;
-        this.pastRealityRate = pastRealityRate;
-        this.avgScore = avgScore;
-        this.notPassRate = notPassRate;
-        this.absentCount = absentCount;
-        this.paperCurrentAvgScore = paperCurrentAvgScore;
-        this.currentNotPassRate = currentNotPassRate;
+    public void setNotPassCount(Integer notPassCount) {
+        this.notPassCount = notPassCount;
+    }
+
+    public Integer getCurrentNotPassCount() {
+        return currentNotPassCount;
+    }
+
+    public void setCurrentNotPassCount(Integer currentNotPassCount) {
+        this.currentNotPassCount = currentNotPassCount;
+    }
+
+    public Integer getCurrentRealityCount() {
+        return currentRealityCount;
+    }
+
+    public void setCurrentRealityCount(Integer currentRealityCount) {
+        this.currentRealityCount = currentRealityCount;
+    }
+
+    public String getCourseCode() {
+        return courseCode;
+    }
+
+    public void setCourseCode(String courseCode) {
+        this.courseCode = courseCode;
+    }
+
+    public String getCourseName() {
+        return courseName;
+    }
+
+    public void setCourseName(String courseName) {
+        this.courseName = courseName;
     }
 
     public String getCourseCodeName() {
-        return courseCodeName;
+        if (Objects.nonNull(courseCode) && Objects.nonNull(courseName)) {
+            return courseCode + "(" + courseName + ")";
+        } else {
+            return courseCodeName;
+        }
     }
 
     public void setCourseCodeName(String courseCodeName) {
@@ -83,12 +124,12 @@ public class TAExamCourseDto implements Serializable {
         this.teachCollegeName = teachCollegeName;
     }
 
-    public String getInspectCollegeName() {
-        return inspectCollegeName;
+    public Integer getInspectCollegeCount() {
+        return inspectCollegeCount;
     }
 
-    public void setInspectCollegeName(String inspectCollegeName) {
-        this.inspectCollegeName = inspectCollegeName;
+    public void setInspectCollegeCount(Integer inspectCollegeCount) {
+        this.inspectCollegeCount = inspectCollegeCount;
     }
 
     public Integer getRealityCount() {
@@ -100,7 +141,7 @@ public class TAExamCourseDto implements Serializable {
     }
 
     public String getCurrentRealityRate() {
-        return currentRealityRate;
+        return currentRealityRate + "(" + currentRealityCount + ")";
     }
 
     public void setCurrentRealityRate(String currentRealityRate) {
@@ -108,7 +149,7 @@ public class TAExamCourseDto implements Serializable {
     }
 
     public String getPastRealityRate() {
-        return pastRealityRate;
+        return pastRealityRate + "(" + pastRealityRate + ")";
     }
 
     public void setPastRealityRate(String pastRealityRate) {
@@ -124,7 +165,7 @@ public class TAExamCourseDto implements Serializable {
     }
 
     public String getNotPassRate() {
-        return notPassRate;
+        return notPassRate + "(" + notPassCount + ")";
     }
 
     public void setNotPassRate(String notPassRate) {
@@ -148,7 +189,7 @@ public class TAExamCourseDto implements Serializable {
     }
 
     public String getCurrentNotPassRate() {
-        return currentNotPassRate;
+        return currentNotPassRate + "(" + currentNotPassCount + ")";
     }
 
     public void setCurrentNotPassRate(String currentNotPassRate) {

teachcloud-report-business/src/main/java/com/qmth/teachcloud/report/business/entity/TAExamCourse.java

@@ -191,6 +191,54 @@ public class TAExamCourse implements Serializable {
     @TableField(value = "coefficient")
     private BigDecimal coefficient;
 
+    @ApiModelProperty(value = "不及格率")
+    @TableField(exist = false)
+    private String notPassRate;
+
+    @ApiModelProperty(value = "应届不及格率")
+    @TableField(exist = false)
+    private String currentNotPassRate;
+
+    @ApiModelProperty(value = "不及格率人数")
+    @TableField(exist = false)
+    private Integer notPassCount;
+
+    @ApiModelProperty(value = "应届不及格人数")
+    @TableField(exist = false)
+    private Integer currentNotPassCount;
+
+    public String getCurrentNotPassRate() {
+        return currentNotPassRate;
+    }
+
+    public void setCurrentNotPassRate(String currentNotPassRate) {
+        this.currentNotPassRate = currentNotPassRate;
+    }
+
+    public Integer getNotPassCount() {
+        return notPassCount;
+    }
+
+    public void setNotPassCount(Integer notPassCount) {
+        this.notPassCount = notPassCount;
+    }
+
+    public Integer getCurrentNotPassCount() {
+        return currentNotPassCount;
+    }
+
+    public void setCurrentNotPassCount(Integer currentNotPassCount) {
+        this.currentNotPassCount = currentNotPassCount;
+    }
+
+    public String getNotPassRate() {
+        return notPassRate;
+    }
+
+    public void setNotPassRate(String notPassRate) {
+        this.notPassRate = notPassRate;
+    }
+
     public static long getSerialVersionUID() {
         return serialVersionUID;
     }

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

@@ -49,7 +49,9 @@
             round(a.past_reality_rate * 100, 1) pastRealityRate,
             round((1 - a.pass_rate),1) as notPassRate,
             a.paper_current_avg_score as paperCurrentAvgScore,
-            round((1 - a.current_pass_rate),1) as currentNotPassRate
+            round((1 - a.current_pass_rate),1) as currentNotPassRate,
+            (a.reality_count - a.pass_count) as notPassCount,
+            (a.current_reality_count - a.current_pass_count) as currentNotPassCount
         FROM
             t_a_exam_course a
                 LEFT JOIN