接口修改

distributed-print-business/src/main/java/com/qmth/distributed/print/business/entity/TCScoreEndExam.java → distributed-print-business/src/main/java/com/qmth/distributed/print/business/entity/TCFinalScore.java

@@ -16,8 +16,8 @@ import java.io.Serializable;
  * @author wangliang
  * @since 2024-02-18
  */
-@ApiModel(value = "TCScoreEndExam对象", description = "期末考试成绩表")
-public class TCScoreEndExam implements Serializable {
+@ApiModel(value = "TCFinalScore对象", description = "期末考试成绩表")
+public class TCFinalScore implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
@@ -42,7 +42,7 @@ public class TCScoreEndExam implements Serializable {
     private String name;
 
     @ApiModelProperty(value = "学号")
-    private String examNumber;
+    private String studentCode;
 
     @ApiModelProperty(value = "分数")
     private Double score;
@@ -67,11 +67,11 @@ public class TCScoreEndExam implements Serializable {
     @ApiModelProperty(value = "更新时间")
     private Long updateTime;
 
-    public TCScoreEndExam() {
+    public TCFinalScore() {
 
     }
 
-    public TCScoreEndExam(Long examId, String courseCode, String courseName, String paperNumber, Long userId) {
+    public TCFinalScore(Long examId, String courseCode, String courseName, String paperNumber, Long userId) {
         this.id = SystemConstant.getDbUuid();
         this.examId = examId;
         this.courseCode = courseCode;
@@ -82,14 +82,14 @@ public class TCScoreEndExam implements Serializable {
         this.createTime = System.currentTimeMillis();
     }
 
-    public TCScoreEndExam(Long examId, String courseCode, String courseName, String paperNumber, String name, String examNumber, Double score, String scoreDetail, Long userId) {
+    public TCFinalScore(Long examId, String courseCode, String courseName, String paperNumber, String name, String studentCode, Double score, String scoreDetail, Long userId) {
         this.id = SystemConstant.getDbUuid();
         this.examId = examId;
         this.courseCode = courseCode;
         this.courseName = courseName;
         this.paperNumber = paperNumber;
         this.name = name;
-        this.examNumber = examNumber;
+        this.studentCode = studentCode;
         this.score = score;
         this.scoreDetail = scoreDetail;
         this.enable = true;
@@ -145,12 +145,12 @@ public class TCScoreEndExam implements Serializable {
         this.name = name;
     }
 
-    public String getExamNumber() {
-        return examNumber;
+    public String getStudentCode() {
+        return studentCode;
     }
 
-    public void setExamNumber(String examNumber) {
-        this.examNumber = examNumber;
+    public void setStudentCode(String studentCode) {
+        this.studentCode = studentCode;
     }
 
     public Double getScore() {

distributed-print-business/src/main/java/com/qmth/distributed/print/business/entity/TCPaperPositive.java → distributed-print-business/src/main/java/com/qmth/distributed/print/business/entity/TCPaperStruct.java

@@ -15,8 +15,8 @@ import java.io.Serializable;
  * @author wangliang
  * @since 2024-02-18
  */
-@ApiModel(value = "TCPaperPositive对象", description = "试卷蓝图表")
-public class TCPaperPositive implements Serializable {
+@ApiModel(value = "TCPaperStruct对象", description = "试卷蓝图表")
+public class TCPaperStruct implements Serializable {
 
     private static final long serialVersionUID = 1L;
 

distributed-print-business/src/main/java/com/qmth/distributed/print/business/entity/TCScoreNormal.java → distributed-print-business/src/main/java/com/qmth/distributed/print/business/entity/TCUsualScore.java

@@ -16,8 +16,8 @@ import java.io.Serializable;
  * @author wangliang
  * @since 2024-02-18
  */
-@ApiModel(value = "TCScoreNormal对象", description = "平常作业成绩表")
-public class TCScoreNormal implements Serializable {
+@ApiModel(value = "TCUsualScore对象", description = "平常作业成绩表")
+public class TCUsualScore implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
@@ -42,10 +42,10 @@ public class TCScoreNormal implements Serializable {
     private String name;
 
     @ApiModelProperty(value = "学号")
-    private String examNumber;
+    private String studentCode;
 
     @ApiModelProperty(value = "平常作业分数")
-    private String scoreNormal;
+    private String score;
 
     @ApiModelProperty(value = "是否启用，0：停用，1：启用")
     private Boolean enable;
@@ -64,11 +64,11 @@ public class TCScoreNormal implements Serializable {
     @ApiModelProperty(value = "更新时间")
     private Long updateTime;
 
-    public TCScoreNormal() {
+    public TCUsualScore() {
 
     }
 
-    public TCScoreNormal(Long examId, String courseCode, String courseName, String paperNumber, Long userId) {
+    public TCUsualScore(Long examId, String courseCode, String courseName, String paperNumber, Long userId) {
         this.id = SystemConstant.getDbUuid();
         this.examId = examId;
         this.courseCode = courseCode;
@@ -79,15 +79,15 @@ public class TCScoreNormal implements Serializable {
         this.createTime = System.currentTimeMillis();
     }
 
-    public TCScoreNormal(Long examId, String courseCode, String courseName, String paperNumber, String name, String examNumber, String scoreNormal, Long userId) {
+    public TCUsualScore(Long examId, String courseCode, String courseName, String paperNumber, String name, String studentCode, String score, Long userId) {
         this.id = SystemConstant.getDbUuid();
         this.examId = examId;
         this.courseCode = courseCode;
         this.courseName = courseName;
         this.paperNumber = paperNumber;
         this.name = name;
-        this.examNumber = examNumber;
-        this.scoreNormal = scoreNormal;
+        this.studentCode = studentCode;
+        this.score = score;
         this.enable = true;
         this.createId = userId;
         this.createTime = System.currentTimeMillis();
@@ -141,20 +141,20 @@ public class TCScoreNormal implements Serializable {
         this.name = name;
     }
 
-    public String getExamNumber() {
-        return examNumber;
+    public String getStudentCode() {
+        return studentCode;
     }
 
-    public void setExamNumber(String examNumber) {
-        this.examNumber = examNumber;
+    public void setStudentCode(String studentCode) {
+        this.studentCode = studentCode;
     }
 
-    public String getScoreNormal() {
-        return scoreNormal;
+    public String getScore() {
+        return score;
     }
 
-    public void setScoreNormal(String scoreNormal) {
-        this.scoreNormal = scoreNormal;
+    public void setScore(String score) {
+        this.score = score;
     }
 
     public Boolean getEnable() {

distributed-print-business/src/main/java/com/qmth/distributed/print/business/entity/TRBasicInfo.java

@@ -15,7 +15,7 @@ import java.io.Serializable;
  * @author wangliang
  * @since 2024-02-18
  */
-@ApiModel(value="TRBasicInfo对象", description="报告基本情况表")
+@ApiModel(value = "TRBasicInfo对象", description = "报告基本情况表")
 public class TRBasicInfo implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -50,22 +50,22 @@ public class TRBasicInfo implements Serializable {
     private String teachingObject;
 
     @ApiModelProperty(value = "选课人数")
-    private Integer numberOfSelect;
+    private Integer selectionCount;
 
     @ApiModelProperty(value = "参评人数")
-    private Integer numberOfParticipants;
+    private Integer participantCount;
 
     @ApiModelProperty(value = "课程目标达成度期望值")
     private Double courseDegree;
 
     @ApiModelProperty(value = "任课老师")
-    private String teach;
+    private String teacher;
 
     @ApiModelProperty(value = "评价责任人")
-    private String appraiseDutyUser;
+    private String director;
 
     @ApiModelProperty(value = "评价参与人")
-    private String appraisePartakeUser;
+    private String participant;
 
     @ApiModelProperty(value = "是否启用，0：停用，1：启用")
     private Boolean enable;
@@ -165,52 +165,52 @@ public class TRBasicInfo implements Serializable {
         this.teachingObject = teachingObject;
     }
 
-    public Integer getNumberOfSelect() {
-        return numberOfSelect;
+    public Double getCourseDegree() {
+        return courseDegree;
     }
 
-    public void setNumberOfSelect(Integer numberOfSelect) {
-        this.numberOfSelect = numberOfSelect;
+    public void setCourseDegree(Double courseDegree) {
+        this.courseDegree = courseDegree;
     }
 
-    public Integer getNumberOfParticipants() {
-        return numberOfParticipants;
+    public Integer getSelectionCount() {
+        return selectionCount;
     }
 
-    public void setNumberOfParticipants(Integer numberOfParticipants) {
-        this.numberOfParticipants = numberOfParticipants;
+    public void setSelectionCount(Integer selectionCount) {
+        this.selectionCount = selectionCount;
     }
 
-    public Double getCourseDegree() {
-        return courseDegree;
+    public Integer getParticipantCount() {
+        return participantCount;
     }
 
-    public void setCourseDegree(Double courseDegree) {
-        this.courseDegree = courseDegree;
+    public void setParticipantCount(Integer participantCount) {
+        this.participantCount = participantCount;
     }
 
-    public String getTeach() {
-        return teach;
+    public String getTeacher() {
+        return teacher;
     }
 
-    public void setTeach(String teach) {
-        this.teach = teach;
+    public void setTeacher(String teacher) {
+        this.teacher = teacher;
     }
 
-    public String getAppraiseDutyUser() {
-        return appraiseDutyUser;
+    public String getDirector() {
+        return director;
     }
 
-    public void setAppraiseDutyUser(String appraiseDutyUser) {
-        this.appraiseDutyUser = appraiseDutyUser;
+    public void setDirector(String director) {
+        this.director = director;
     }
 
-    public String getAppraisePartakeUser() {
-        return appraisePartakeUser;
+    public String getParticipant() {
+        return participant;
     }
 
-    public void setAppraisePartakeUser(String appraisePartakeUser) {
-        this.appraisePartakeUser = appraisePartakeUser;
+    public void setParticipant(String participant) {
+        this.participant = participant;
     }
 
     public Boolean getEnable() {

distributed-print-business/src/main/java/com/qmth/distributed/print/business/entity/TRExamStudent.java

@@ -32,10 +32,10 @@ public class TRExamStudent implements Serializable {
     private String name;
 
     @ApiModelProperty(value = "学号")
-    private String examNumber;
+    private String studentCode;
 
     @ApiModelProperty(value = "行政班级")
-    private String clazz;
+    private String administrativeClass;
 
     @ApiModelProperty(value = "学生成绩")
     private Double score;
@@ -75,20 +75,20 @@ public class TRExamStudent implements Serializable {
         this.name = name;
     }
 
-    public String getExamNumber() {
-        return examNumber;
+    public String getStudentCode() {
+        return studentCode;
     }
 
-    public void setExamNumber(String examNumber) {
-        this.examNumber = examNumber;
+    public void setStudentCode(String studentCode) {
+        this.studentCode = studentCode;
     }
 
-    public String getClazz() {
-        return clazz;
+    public String getAdministrativeClass() {
+        return administrativeClass;
     }
 
-    public void setClazz(String clazz) {
-        this.clazz = clazz;
+    public void setAdministrativeClass(String administrativeClass) {
+        this.administrativeClass = administrativeClass;
     }
 
     public String getResultDetail() {

distributed-print-business/src/main/java/com/qmth/distributed/print/business/mapper/TCScoreEndExamMapper.java → distributed-print-business/src/main/java/com/qmth/distributed/print/business/mapper/TCFinalScoreMapper.java

@@ -1,6 +1,6 @@
 package com.qmth.distributed.print.business.mapper;
 
-import com.qmth.distributed.print.business.entity.TCScoreEndExam;
+import com.qmth.distributed.print.business.entity.TCFinalScore;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
@@ -11,6 +11,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @author wangliang
  * @since 2024-02-18
  */
-public interface TCScoreEndExamMapper extends BaseMapper<TCScoreEndExam> {
+public interface TCFinalScoreMapper extends BaseMapper<TCFinalScore> {
 
 }

distributed-print-business/src/main/java/com/qmth/distributed/print/business/mapper/TCPaperPositiveMapper.java → distributed-print-business/src/main/java/com/qmth/distributed/print/business/mapper/TCPaperStructMapper.java

@@ -1,6 +1,6 @@
 package com.qmth.distributed.print.business.mapper;
 
-import com.qmth.distributed.print.business.entity.TCPaperPositive;
+import com.qmth.distributed.print.business.entity.TCPaperStruct;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
@@ -11,6 +11,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @author wangliang
  * @since 2024-02-18
  */
-public interface TCPaperPositiveMapper extends BaseMapper<TCPaperPositive> {
+public interface TCPaperStructMapper extends BaseMapper<TCPaperStruct> {
 
 }

distributed-print-business/src/main/java/com/qmth/distributed/print/business/mapper/TCScoreNormalMapper.java → distributed-print-business/src/main/java/com/qmth/distributed/print/business/mapper/TCUsualScoreMapper.java

@@ -3,7 +3,7 @@ package com.qmth.distributed.print.business.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.qmth.distributed.print.business.bean.result.ScoreResult;
-import com.qmth.distributed.print.business.entity.TCScoreNormal;
+import com.qmth.distributed.print.business.entity.TCUsualScore;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.Map;
@@ -16,16 +16,15 @@ import java.util.Map;
  * @author wangliang
  * @since 2024-02-18
  */
-public interface TCScoreNormalMapper extends BaseMapper<TCScoreNormal> {
+public interface TCUsualScoreMapper extends BaseMapper<TCUsualScore> {
 
     /**
      * 成绩管理列表
      *
      * @param iPage
-     * @param semesterId
      * @param examId
      * @param courseCode
      * @return
      */
-    public IPage<ScoreResult> scoreList(IPage<Map> iPage, @Param("semesterId") Long semesterId, @Param("examId") Long examId, @Param("courseCode") String courseCode);
+    public IPage<ScoreResult> scoreList(IPage<Map> iPage, @Param("examId") Long examId, @Param("courseCode") String courseCode);
 }

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/TCScoreEndExamService.java → distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/TCFinalScoreService.java

@@ -1,6 +1,6 @@
 package com.qmth.distributed.print.business.service;
 
-import com.qmth.distributed.print.business.entity.TCScoreEndExam;
+import com.qmth.distributed.print.business.entity.TCFinalScore;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**
@@ -11,6 +11,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @author wangliang
  * @since 2024-02-18
  */
-public interface TCScoreEndExamService extends IService<TCScoreEndExam> {
+public interface TCFinalScoreService extends IService<TCFinalScore> {
 
 }

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/TCPaperPositiveService.java → distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/TCPaperStructService.java

@@ -1,6 +1,6 @@
 package com.qmth.distributed.print.business.service;
 
-import com.qmth.distributed.print.business.entity.TCPaperPositive;
+import com.qmth.distributed.print.business.entity.TCPaperStruct;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**
@@ -11,6 +11,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @author wangliang
  * @since 2024-02-18
  */
-public interface TCPaperPositiveService extends IService<TCPaperPositive> {
+public interface TCPaperStructService extends IService<TCPaperStruct> {
 
 }

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/TCScoreNormalService.java → distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/TCUsualScoreService.java

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.qmth.distributed.print.business.bean.excel.ExcelField;
 import com.qmth.distributed.print.business.bean.result.ScoreResult;
-import com.qmth.distributed.print.business.entity.TCScoreNormal;
+import com.qmth.distributed.print.business.entity.TCUsualScore;
 import com.qmth.teachcloud.mark.entity.MarkPaper;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -20,18 +20,17 @@ import java.util.Map;
  * @author wangliang
  * @since 2024-02-18
  */
-public interface TCScoreNormalService extends IService<TCScoreNormal> {
+public interface TCUsualScoreService extends IService<TCUsualScore> {
 
     /**
      * 成绩管理列表
      *
      * @param iPage
-     * @param semesterId
      * @param examId
      * @param courseCode
      * @return
      */
-    public IPage<ScoreResult> scoreList(IPage<Map> iPage, Long semesterId, Long examId, String courseCode);
+    public IPage<ScoreResult> scoreList(IPage<Map> iPage, Long examId, String courseCode);
 
     /**
      * 动态生成excel

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/TCFinalScoreServiceImpl.java

@@ -0,0 +1,20 @@
+package com.qmth.distributed.print.business.service.impl;
+
+import com.qmth.distributed.print.business.entity.TCFinalScore;
+import com.qmth.distributed.print.business.mapper.TCFinalScoreMapper;
+import com.qmth.distributed.print.business.service.TCFinalScoreService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 期末考试成绩表 服务实现类
+ * </p>
+ *
+ * @author wangliang
+ * @since 2024-02-18
+ */
+@Service
+public class TCFinalScoreServiceImpl extends ServiceImpl<TCFinalScoreMapper, TCFinalScore> implements TCFinalScoreService {
+
+}

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/TCPaperPositiveServiceImpl.java

@@ -1,20 +0,0 @@
-package com.qmth.distributed.print.business.service.impl;
-
-import com.qmth.distributed.print.business.entity.TCPaperPositive;
-import com.qmth.distributed.print.business.mapper.TCPaperPositiveMapper;
-import com.qmth.distributed.print.business.service.TCPaperPositiveService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 试卷蓝图表 服务实现类
- * </p>
- *
- * @author wangliang
- * @since 2024-02-18
- */
-@Service
-public class TCPaperPositiveServiceImpl extends ServiceImpl<TCPaperPositiveMapper, TCPaperPositive> implements TCPaperPositiveService {
-
-}

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/TCPaperStructServiceImpl.java

@@ -0,0 +1,20 @@
+package com.qmth.distributed.print.business.service.impl;
+
+import com.qmth.distributed.print.business.entity.TCPaperStruct;
+import com.qmth.distributed.print.business.mapper.TCPaperStructMapper;
+import com.qmth.distributed.print.business.service.TCPaperStructService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 试卷蓝图表 服务实现类
+ * </p>
+ *
+ * @author wangliang
+ * @since 2024-02-18
+ */
+@Service
+public class TCPaperStructServiceImpl extends ServiceImpl<TCPaperStructMapper, TCPaperStruct> implements TCPaperStructService {
+
+}

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/TCScoreEndExamServiceImpl.java

@@ -1,20 +0,0 @@
-package com.qmth.distributed.print.business.service.impl;
-
-import com.qmth.distributed.print.business.entity.TCScoreEndExam;
-import com.qmth.distributed.print.business.mapper.TCScoreEndExamMapper;
-import com.qmth.distributed.print.business.service.TCScoreEndExamService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 期末考试成绩表 服务实现类
- * </p>
- *
- * @author wangliang
- * @since 2024-02-18
- */
-@Service
-public class TCScoreEndExamServiceImpl extends ServiceImpl<TCScoreEndExamMapper, TCScoreEndExam> implements TCScoreEndExamService {
-
-}

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/TCScoreNormalServiceImpl.java → distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/TCUsualScoreServiceImpl.java

@@ -4,9 +4,9 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.qmth.distributed.print.business.bean.excel.ExcelField;
 import com.qmth.distributed.print.business.bean.result.ScoreResult;
-import com.qmth.distributed.print.business.entity.TCScoreNormal;
-import com.qmth.distributed.print.business.mapper.TCScoreNormalMapper;
-import com.qmth.distributed.print.business.service.TCScoreNormalService;
+import com.qmth.distributed.print.business.entity.TCUsualScore;
+import com.qmth.distributed.print.business.mapper.TCUsualScoreMapper;
+import com.qmth.distributed.print.business.service.TCUsualScoreService;
 import com.qmth.teachcloud.common.contant.SystemConstant;
 import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
 import com.qmth.teachcloud.common.util.ExcelUtil;
@@ -42,7 +42,7 @@ import java.util.Random;
  * @since 2024-02-18
  */
 @Service
-public class TCScoreNormalServiceImpl extends ServiceImpl<TCScoreNormalMapper, TCScoreNormal> implements TCScoreNormalService {
+public class TCUsualScoreServiceImpl extends ServiceImpl<TCUsualScoreMapper, TCUsualScore> implements TCUsualScoreService {
 
     @Resource
     MarkPaperService markPaperService;
@@ -51,14 +51,13 @@ public class TCScoreNormalServiceImpl extends ServiceImpl<TCScoreNormalMapper, T
      * 成绩管理列表
      *
      * @param iPage
-     * @param semesterId
      * @param examId
      * @param courseCode
      * @return
      */
     @Override
-    public IPage<ScoreResult> scoreList(IPage<Map> iPage, Long semesterId, Long examId, String courseCode) {
-        return this.baseMapper.scoreList(iPage, semesterId, examId, courseCode);
+    public IPage<ScoreResult> scoreList(IPage<Map> iPage, Long examId, String courseCode) {
+        return this.baseMapper.scoreList(iPage, examId, courseCode);
     }
 
     /**

distributed-print-business/src/main/resources/mapper/TCScoreEndExamMapper.xml → distributed-print-business/src/main/resources/mapper/TCFinalScoreMapper.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.qmth.distributed.print.business.mapper.TCScoreEndExamMapper">
+<mapper namespace="com.qmth.distributed.print.business.mapper.TCFinalScoreMapper">
 
 </mapper>

distributed-print-business/src/main/resources/mapper/TCPaperPositiveMapper.xml → distributed-print-business/src/main/resources/mapper/TCPaperStructMapper.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.qmth.distributed.print.business.mapper.TCPaperPositiveMapper">
+<mapper namespace="com.qmth.distributed.print.business.mapper.TCPaperStructMapper">
 
 </mapper>

distributed-print-business/src/main/resources/mapper/TCScoreNormalMapper.xml → distributed-print-business/src/main/resources/mapper/TCUsualScoreMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.qmth.distributed.print.business.mapper.TCScoreNormalMapper">
+<mapper namespace="com.qmth.distributed.print.business.mapper.TCUsualScoreMapper">
 
     <select id="scoreList" resultType="com.qmth.distributed.print.business.bean.result.ScoreResult">
         SELECT distinct t.id,
@@ -14,9 +14,6 @@
             left join basic_exam be on be.id = t.exam_id
             left join basic_semester bs on bs.id = be.semester_id
         <where>
-            <if test="semesterId != null and semesterId != ''">
-                and bs.id = #{semesterId}
-            </if>
             <if test="examId != null and examId != ''">
                 and t.exam_id = #{examId}
             </if>

distributed-print/install/mysql/upgrade/3.3.1.sql

@@ -50,43 +50,43 @@ INSERT INTO sys_privilege
 VALUES(2007, '列表', '/api/admin/course/degree/score/list', 'URL', 2001, 1, 'AUTH', NULL, 1, 1, 1);
 INSERT INTO sys_privilege
 (id, name, url, `type`, parent_id, `sequence`, property, related, enable, default_auth, front_display)
-VALUES(2008, '平时成绩-下载模版', '/api/admin/course/degree/score/template_download', 'URL', 2006, 1, 'AUTH', NULL, 1, 1, 1);
+VALUES(2008, '平时成绩-下载模版', '/api/admin/course/degree/usual_score/template_download', 'URL', 2006, 1, 'AUTH', NULL, 1, 1, 1);
 INSERT INTO sys_privilege
 (id, name, url, `type`, parent_id, `sequence`, property, related, enable, default_auth, front_display)
-VALUES(2009, '平时成绩-导入模版', '/api/admin/course/degree/score/import', 'URL', 2006, 1, 'AUTH', NULL, 1, 1, 1);
+VALUES(2009, '平时成绩-导入模版', '/api/admin/course/degree/usual_score/import', 'URL', 2006, 1, 'AUTH', NULL, 1, 1, 1);
 INSERT INTO sys_privilege
 (id, name, url, `type`, parent_id, `sequence`, property, related, enable, default_auth, front_display)
-VALUES(2010, '平时成绩列表', '/api/admin/course/degree/score/normal/list', 'URL', 2006, 1, 'AUTH', NULL, 1, 1, 1);
+VALUES(2010, '平时成绩列表', '/api/admin/course/degree/usual_score/list', 'URL', 2006, 1, 'AUTH', NULL, 1, 1, 1);
 INSERT INTO sys_privilege
 (id, name, url, `type`, parent_id, `sequence`, property, related, enable, default_auth, front_display)
-VALUES(2011, '平时成绩编辑', '/api/admin/course/degree/score/normal/edit', 'URL', 2006, 1, 'AUTH', NULL, 1, 1, 1);
+VALUES(2011, '平时成绩编辑', '/api/admin/course/degree/usual_score/edit', 'URL', 2006, 1, 'AUTH', NULL, 1, 1, 1);
 INSERT INTO sys_privilege
 (id, name, url, `type`, parent_id, `sequence`, property, related, enable, default_auth, front_display)
-VALUES(2012, '平时成绩保存', '/api/admin/course/degree/score/normal/save', 'URL', 2006, 1, 'AUTH', NULL, 1, 1, 1);
+VALUES(2012, '平时成绩保存', '/api/admin/course/degree/usual_score/save', 'URL', 2006, 1, 'AUTH', NULL, 1, 1, 1);
 INSERT INTO sys_privilege
 (id, name, url, `type`, parent_id, `sequence`, property, related, enable, default_auth, front_display)
-VALUES(2013, '平时成绩启用/禁用', '/api/admin/course/degree/score/normal/enable', 'URL', 2006, 1, 'AUTH', NULL, 1, 1, 1);
+VALUES(2013, '平时成绩启用/禁用', '/api/admin/course/degree/usual_score/enable', 'URL', 2006, 1, 'AUTH', NULL, 1, 1, 1);
 INSERT INTO sys_privilege
 (id, name, url, `type`, parent_id, `sequence`, property, related, enable, default_auth, front_display)
 VALUES(2014, '期末成绩-下载模版', '/api/admin/course/degree/score/end_exam/template_download', 'URL', 2006, 1, 'AUTH', NULL, 1, 1, 1);
 INSERT INTO sys_privilege
 (id, name, url, `type`, parent_id, `sequence`, property, related, enable, default_auth, front_display)
-VALUES(2015, '期末成绩-导入模版', '/api/admin/course/degree/score/end_exam/import', 'URL', 2006, 1, 'AUTH', NULL, 1, 1, 1);
+VALUES(2015, '期末成绩-导入模版', '/api/admin/course/degree/final_score/import', 'URL', 2006, 1, 'AUTH', NULL, 1, 1, 1);
 INSERT INTO sys_privilege
 (id, name, url, `type`, parent_id, `sequence`, property, related, enable, default_auth, front_display)
-VALUES(2016, '期末成绩列表', '/api/admin/course/degree/score/end_exam/list', 'URL', 2006, 1, 'AUTH', NULL, 1, 1, 1);
+VALUES(2016, '期末成绩列表', '/api/admin/course/degree/final_score/list', 'URL', 2006, 1, 'AUTH', NULL, 1, 1, 1);
 INSERT INTO sys_privilege
 (id, name, url, `type`, parent_id, `sequence`, property, related, enable, default_auth, front_display)
-VALUES(2017, '期末成绩编辑', '/api/admin/course/degree/score/end_exam/edit', 'URL', 2006, 1, 'AUTH', NULL, 1, 1, 1);
+VALUES(2017, '期末成绩编辑', '/api/admin/course/degree/final_score/edit', 'URL', 2006, 1, 'AUTH', NULL, 1, 1, 1);
 INSERT INTO sys_privilege
 (id, name, url, `type`, parent_id, `sequence`, property, related, enable, default_auth, front_display)
-VALUES(2018, '期末成绩保存', '/api/admin/course/degree/score/end_exam/save', 'URL', 2006, 1, 'AUTH', NULL, 1, 1, 1);
+VALUES(2018, '期末成绩保存', '/api/admin/course/degree/final_score/save', 'URL', 2006, 1, 'AUTH', NULL, 1, 1, 1);
 INSERT INTO sys_privilege
 (id, name, url, `type`, parent_id, `sequence`, property, related, enable, default_auth, front_display)
-VALUES(2019, '期末成绩启用/禁用', '/api/admin/course/degree/score/end_exam/enable', 'URL', 2006, 1, 'AUTH', NULL, 1, 1, 1);
+VALUES(2019, '期末成绩启用/禁用', '/api/admin/course/degree/final_score/enable', 'URL', 2006, 1, 'AUTH', NULL, 1, 1, 1);
 INSERT INTO sys_privilege
 (id, name, url, `type`, parent_id, `sequence`, property, related, enable, default_auth, front_display)
-VALUES(2020, '保存试卷蓝图', '/api/admin/course/degree/score/end_exam/paper_positive/save', 'URL', 2006, 1, 'AUTH', NULL, 1, 1, 1);
+VALUES(2020, '保存试卷蓝图', '/api/admin/course/degree/final_score/paper_struct/save', 'URL', 2006, 1, 'AUTH', NULL, 1, 1, 1);
 INSERT INTO sys_privilege
 (id, name, url, `type`, parent_id, `sequence`, property, related, enable, default_auth, front_display)
 VALUES(2021, '列表', 'List', 'LIST', 2002, 1, 'AUTH', '2024', 1, 0, 1);
@@ -113,11 +113,11 @@ INSERT INTO sys_privilege
 VALUES(2028, '保存报告', '/api/admin/course/degree/report/save', 'URL', 2025, 1, 'AUTH', NULL, 1, 1, 1);
 INSERT INTO sys_privilege
 (id, name, url, `type`, parent_id, `sequence`, property, related, enable, default_auth, front_display)
-VALUES(2029, '获取试卷蓝图信息', '/api/admin/course/degree/score/end_exam/paper_positive/query', 'URL', 2006, 1, 'AUTH', NULL, 1, 1, 1);
+VALUES(2029, '获取试卷蓝图信息', '/api/admin/course/degree/final_score/paper_struct/query', 'URL', 2006, 1, 'AUTH', NULL, 1, 1, 1);
 
 --2024/2/18
-DROP TABLE IF EXISTS `t_c_paper_positive`;
-CREATE TABLE `t_c_paper_positive` (
+DROP TABLE IF EXISTS `t_c_paper_struct`;
+CREATE TABLE `t_c_paper_struct` (
                                       `id` bigint NOT NULL COMMENT '主键',
                                       `exam_id` bigint NOT NULL COMMENT '考试id',
                                       `course_code` varchar(100) COLLATE utf8mb4_general_ci NOT NULL COMMENT '课程编码',
@@ -132,15 +132,15 @@ CREATE TABLE `t_c_paper_positive` (
                                       PRIMARY KEY (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='试卷蓝图表';
 
-DROP TABLE IF EXISTS `t_c_score_end_exam`;
-CREATE TABLE `t_c_score_end_exam` (
+DROP TABLE IF EXISTS `t_c_final_score`;
+CREATE TABLE `t_c_final_score` (
                                       `id` bigint NOT NULL COMMENT '主键',
                                       `exam_id` bigint NOT NULL COMMENT '考试id',
                                       `course_code` varchar(100) COLLATE utf8mb4_general_ci NOT NULL COMMENT '课程编码',
                                       `course_name` varchar(100) COLLATE utf8mb4_general_ci NOT NULL COMMENT '课程名称',
                                       `paper_number` varchar(100) COLLATE utf8mb4_general_ci NOT NULL COMMENT '试卷编码',
                                       `name` varchar(100) COLLATE utf8mb4_general_ci NOT NULL COMMENT '考生姓名',
-                                      `exam_number` varchar(100) COLLATE utf8mb4_general_ci NOT NULL COMMENT '学号',
+                                      `student_code` varchar(100) COLLATE utf8mb4_general_ci NOT NULL COMMENT '学号',
                                       `score` double NOT NULL COMMENT '分数',
                                       `score_detail` mediumtext NOT NULL COMMENT '成绩明细',
                                       `enable` tinyint NOT NULL DEFAULT '1' COMMENT '是否启用，0：停用，1：启用',
@@ -152,16 +152,16 @@ CREATE TABLE `t_c_score_end_exam` (
                                       UNIQUE KEY `t_c_score_end_exam_unique` (`exam_id`,`course_code`,`course_name`,`paper_number`,`name`,`exam_number`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='期末考试成绩表';
 
-DROP TABLE IF EXISTS `t_c_score_normal`;
-CREATE TABLE `t_c_score_normal` (
+DROP TABLE IF EXISTS `t_c_usual_score`;
+CREATE TABLE `t_c_usual_score (
                                     `id` bigint NOT NULL COMMENT '主键',
                                     `exam_id` bigint NOT NULL COMMENT '考试id',
                                     `course_code` varchar(100) COLLATE utf8mb4_general_ci NOT NULL COMMENT '课程编码',
                                     `course_name` varchar(100) COLLATE utf8mb4_general_ci NOT NULL COMMENT '课程名称',
                                     `paper_number` varchar(100) COLLATE utf8mb4_general_ci NOT NULL COMMENT '试卷编码',
                                     `name` varchar(100) COLLATE utf8mb4_general_ci NOT NULL COMMENT '考生姓名',
-                                    `exam_number` varchar(100) COLLATE utf8mb4_general_ci NOT NULL COMMENT '学号',
-                                    `score_normal` mediumtext NOT NULL COMMENT '平常作业分数',
+                                    `student_code` varchar(100) COLLATE utf8mb4_general_ci NOT NULL COMMENT '学号',
+                                    `score` mediumtext NOT NULL COMMENT '平常作业分数',
                                     `enable` tinyint NOT NULL DEFAULT '1' COMMENT '是否启用，0：停用，1：启用',
                                     `create_id` bigint DEFAULT NULL COMMENT '创建人id',
                                     `create_time` bigint DEFAULT NULL COMMENT '创建时间',
@@ -182,12 +182,12 @@ CREATE TABLE `t_r_basic_info` (
                                   `evaluation_mode` varchar(100) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '考核方式',
                                   `open_time` varchar(100) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '开课时间',
                                   `teaching_object` varchar(100) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '授课对象',
-                                  `number_of_select` int DEFAULT NULL COMMENT '选课人数',
-                                  `number_of_participants` int DEFAULT NULL COMMENT '参评人数',
+                                  `selection_count` int DEFAULT NULL COMMENT '选课人数',
+                                  `participant_count` int DEFAULT NULL COMMENT '参评人数',
                                   `course_degree` double DEFAULT NULL COMMENT '课程目标达成度期望值',
-                                  `teach` varchar(100) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '任课老师',
-                                  `appraise_duty_user` varchar(100) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '评价责任人',
-                                  `appraise_partake_user` varchar(100) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '评价参与人',
+                                  `teacher` varchar(100) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '任课老师',
+                                  `director` varchar(100) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '评价责任人',
+                                  `participant` varchar(100) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '评价参与人',
                                   `enable` tinyint NOT NULL DEFAULT '1' COMMENT '是否启用，0：停用，1：启用',
                                   `create_id` bigint DEFAULT NULL COMMENT '创建人id',
                                   `create_time` bigint DEFAULT NULL COMMENT '创建时间',
@@ -205,8 +205,8 @@ CREATE TABLE `t_r_exam_student` (
                                     `id` bigint NOT NULL COMMENT '主键',
                                     `r_basic_info_id` bigint NOT NULL COMMENT '报告id',
                                     `name` varchar(100) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '考生姓名',
-                                    `exam_number` varchar(100) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '学号',
-                                    `clazz` varchar(100) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '行政班级',
+                                    `student_code` varchar(100) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '学号',
+                                    `administrative_class` varchar(100) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '行政班级',
                                     `score` double COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '学生成绩',
                                     `result_detail` mediumtext DEFAULT NULL COMMENT '考生课程考核成绩评价明细结果',
                                     PRIMARY KEY (`id`)

distributed-print/src/main/java/com/qmth/distributed/print/api/TCScoreEndExamController.java → distributed-print/src/main/java/com/qmth/distributed/print/api/TCFinalScoreController.java

@@ -8,9 +8,9 @@ import com.qmth.boot.api.constant.ApiConstant;
 import com.qmth.boot.api.exception.ApiException;
 import com.qmth.distributed.print.business.bean.excel.ExcelField;
 import com.qmth.distributed.print.business.bean.result.EditResult;
-import com.qmth.distributed.print.business.entity.TCScoreEndExam;
-import com.qmth.distributed.print.business.service.TCScoreEndExamService;
-import com.qmth.distributed.print.business.service.TCScoreNormalService;
+import com.qmth.distributed.print.business.entity.TCFinalScore;
+import com.qmth.distributed.print.business.service.TCFinalScoreService;
+import com.qmth.distributed.print.business.service.TCUsualScoreService;
 import com.qmth.teachcloud.common.annotation.OperationLogDetail;
 import com.qmth.teachcloud.common.contant.SystemConstant;
 import com.qmth.teachcloud.common.entity.SysUser;
@@ -47,46 +47,46 @@ import java.util.*;
 @Api(tags = "课程目标达成度-成绩管理-期末考试成绩Controller")
 @RestController
 @RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + SystemConstant.PREFIX_URL_COURSE_DEGREE)
-public class TCScoreEndExamController {
-    private final static Logger log = LoggerFactory.getLogger(TCScoreEndExamController.class);
+public class TCFinalScoreController {
+    private final static Logger log = LoggerFactory.getLogger(TCFinalScoreController.class);
 
     @Resource
-    TCScoreNormalService tcScoreNormalService;
+    TCUsualScoreService tcUsualScoreService;
 
     @Resource
-    TCScoreEndExamService tcScoreEndExamService;
+    TCFinalScoreService tcFinalScoreService;
 
     @ApiOperation(value = "导入期末成绩-模板下载")
-    @RequestMapping(value = "/score/end_exam/template_download", method = RequestMethod.POST)
+    @RequestMapping(value = "/final_score/template_download", method = RequestMethod.POST)
     @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.EXPORT)
     @ApiResponses({@ApiResponse(code = 200, message = "下载成功", response = Object.class)})
-    public void endExamTemplateDownload(@ApiParam(value = "考试id", required = true) @RequestParam Long examId,
-                                        @ApiParam(value = "科目编码", required = true) @RequestParam String courseCode,
-                                        @ApiParam(value = "试卷编号", required = true) @RequestParam String paperNumber) throws IOException {
+    public void finalScoreTemplateDownload(@ApiParam(value = "考试id", required = true) @RequestParam Long examId,
+                                           @ApiParam(value = "科目编码", required = true) @RequestParam String courseCode,
+                                           @ApiParam(value = "试卷编号", required = true) @RequestParam String paperNumber) throws IOException {
         List<ExcelField> excelFieldList = new ArrayList<>();
-        excelFieldList.add(new ExcelField("examNumber", "学号", true));
+        excelFieldList.add(new ExcelField("studentCode", "学号", true));
         excelFieldList.add(new ExcelField("name", "姓名", true));
         excelFieldList.add(new ExcelField("score", "成绩", true));
         excelFieldList.add(new ExcelField("key1", "1-1", true));
         excelFieldList.add(new ExcelField("key2", "1-2", false));
-        tcScoreNormalService.downLoadExaminationTemplate("1、所有字段均为必填字段；\n" +
+        tcUsualScoreService.downLoadExaminationTemplate("1、所有字段均为必填字段；\n" +
                 "2、期末成绩按总分，和小题分录入，题号按大题号-小题号方式录入，如下，1-1表示第一大题第一小题，2-1表示第二大题第一小题；\n" +
                 "3、请不要删除此行，也不要删除模板中的任何列；\n" +
                 "4、使用前请先删除样例数据。", "sheet1", "期末成绩导入模版", excelFieldList);
     }
 
     @ApiOperation(value = "导入期末成绩")
-    @RequestMapping(value = "/score/end_exam/import", method = RequestMethod.POST)
+    @RequestMapping(value = "/final_score/import", method = RequestMethod.POST)
     @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.IMPORT)
     @ApiResponses({@ApiResponse(code = 200, message = "导入成功", response = EditResult.class)})
     @Transactional
-    public Object scoreEndExamImport(@ApiParam(value = "上传文件", required = true) @RequestParam MultipartFile file,
-                                     @ApiParam(value = "考试id", required = true) @RequestParam Long examId,
-                                     @ApiParam(value = "科目编码", required = true) @RequestParam String courseCode,
-                                     @ApiParam(value = "试卷编号", required = true) @RequestParam String paperNumber) throws IOException {
+    public Object finalScoreExamImport(@ApiParam(value = "上传文件", required = true) @RequestParam MultipartFile file,
+                                       @ApiParam(value = "考试id", required = true) @RequestParam Long examId,
+                                       @ApiParam(value = "科目编码", required = true) @RequestParam String courseCode,
+                                       @ApiParam(value = "试卷编号", required = true) @RequestParam String paperNumber) throws IOException {
         log.debug("导入Excel开始...");
         long start = System.currentTimeMillis();
-        MarkPaper markPaper = tcScoreNormalService.importExcelVaild(file, examId, paperNumber);
+        MarkPaper markPaper = tcUsualScoreService.importExcelVaild(file, examId, paperNumber);
 
         Map<String, String> messageMap = new LinkedHashMap<>();
         try {
@@ -96,7 +96,7 @@ public class TCScoreEndExamController {
             log.info("list:{}", JacksonUtil.parseJson(list));
 
             SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
-            List<TCScoreEndExam> tcScoreEndExamList = new ArrayList<>(list.size());
+            List<TCFinalScore> tcFinalScoreList = new ArrayList<>(list.size());
             Map<String, String> headMap = list.get(0);
             for (Map.Entry<String, String> entry : headMap.entrySet()) {
                 if (Objects.equals(entry.getKey(), 0) && Objects.nonNull(entry.getValue()) &&
@@ -115,7 +115,7 @@ public class TCScoreEndExamController {
                 Map<String, String> objectMap = list.get(i);
                 boolean error = false;
                 JSONArray jsonArray = new JSONArray();
-                TCScoreEndExam tcScoreEndExam = new TCScoreEndExam(examId, courseCode, markPaper.getCourseName(), paperNumber, sysUser.getId());
+                TCFinalScore tcFinalScore = new TCFinalScore(examId, courseCode, markPaper.getCourseName(), paperNumber, sysUser.getId());
                 for (Map.Entry<String, String> entry : objectMap.entrySet()) {
                     JSONObject jsonObject = new JSONObject();
                     if (Objects.isNull(entry.getValue()) || Objects.equals(entry.getValue().trim(), "")) {
@@ -125,11 +125,11 @@ public class TCScoreEndExamController {
                         String head = headMap.get(entry.getKey());
                         Objects.requireNonNull(head, "表头信息异常");
                         if (Objects.equals(head.trim(), "学号")) {
-                            tcScoreEndExam.setExamNumber(entry.getValue());
+                            tcFinalScore.setStudentCode(entry.getValue());
                         } else if (Objects.equals(head.trim(), "姓名")) {
-                            tcScoreEndExam.setName(entry.getValue());
+                            tcFinalScore.setName(entry.getValue());
                         } else if (Objects.equals(head.trim(), "成绩")) {
-                            tcScoreEndExam.setScore(Double.valueOf(entry.getValue()));
+                            tcFinalScore.setScore(Double.valueOf(entry.getValue()));
                         } else {
                             jsonObject.put("name", headMap.get(entry.getKey()));
                             jsonObject.put("score", entry.getValue());
@@ -138,22 +138,22 @@ public class TCScoreEndExamController {
                     }
                 }
                 if (jsonArray.size() > 0) {
-                    tcScoreEndExam.setScoreDetail(jsonArray.toJSONString());
+                    tcFinalScore.setScoreDetail(jsonArray.toJSONString());
                 }
                 if (!error) {
-                    tcScoreEndExamList.add(tcScoreEndExam);
+                    tcFinalScoreList.add(tcFinalScore);
                 }
             }
-            if (!CollectionUtils.isEmpty(tcScoreEndExamList)) {
-                successData.add("共导入" + tcScoreEndExamList.size() + "条数据");
-
-                QueryWrapper<TCScoreEndExam> tcScoreEndExamQueryWrapper = new QueryWrapper<>();
-                tcScoreEndExamQueryWrapper.lambda().eq(TCScoreEndExam::getExamId, examId)
-                        .eq(TCScoreEndExam::getCourseCode, courseCode)
-                        .eq(TCScoreEndExam::getCourseName, markPaper.getCourseName())
-                        .eq(TCScoreEndExam::getPaperNumber, paperNumber);
-                tcScoreEndExamService.remove(tcScoreEndExamQueryWrapper);
-                tcScoreEndExamService.saveBatch(tcScoreEndExamList);
+            if (!CollectionUtils.isEmpty(tcFinalScoreList)) {
+                successData.add("共导入" + tcFinalScoreList.size() + "条数据");
+
+                QueryWrapper<TCFinalScore> tcScoreEndExamQueryWrapper = new QueryWrapper<>();
+                tcScoreEndExamQueryWrapper.lambda().eq(TCFinalScore::getExamId, examId)
+                        .eq(TCFinalScore::getCourseCode, courseCode)
+                        .eq(TCFinalScore::getCourseName, markPaper.getCourseName())
+                        .eq(TCFinalScore::getPaperNumber, paperNumber);
+                tcFinalScoreService.remove(tcScoreEndExamQueryWrapper);
+                tcFinalScoreService.saveBatch(tcFinalScoreList);
             }
             messageMap.put("正确信息", successData.length() > 0 ? successData.toString() : "无");
             messageMap.put("错误信息", errorData.length() > 0 ? errorData.toString() : "无");
@@ -176,59 +176,59 @@ public class TCScoreEndExamController {
     }
 
     @ApiOperation(value = "期末成绩列表")
-    @RequestMapping(value = "/score/end_exam/list", method = RequestMethod.POST)
+    @RequestMapping(value = "/final_score/list", method = RequestMethod.POST)
     @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.SEARCH)
     @ApiResponses({@ApiResponse(code = 200, message = "分页查询", response = EditResult.class)})
-    public Object scoreEndExamList(@ApiParam(value = "考试id", required = true) @RequestParam Long examId,
-                                   @ApiParam(value = "科目编码", required = true) @RequestParam String courseCode,
-                                   @ApiParam(value = "试卷编号", required = true) @RequestParam String paperNumber,
-                                   @ApiParam(value = "分页页码", required = true) @RequestParam @Min(SystemConstant.PAGE_NUMBER_MIN) Integer pageNumber,
-                                   @ApiParam(value = "分页数", required = true) @RequestParam @Min(SystemConstant.PAGE_SIZE_MIN) @Max(SystemConstant.PAGE_SIZE_MAX) Integer pageSize) throws IOException {
+    public Object finalScoreList(@ApiParam(value = "考试id", required = true) @RequestParam Long examId,
+                                 @ApiParam(value = "科目编码", required = true) @RequestParam String courseCode,
+                                 @ApiParam(value = "试卷编号", required = true) @RequestParam String paperNumber,
+                                 @ApiParam(value = "分页页码", required = true) @RequestParam @Min(SystemConstant.PAGE_NUMBER_MIN) Integer pageNumber,
+                                 @ApiParam(value = "分页数", required = true) @RequestParam @Min(SystemConstant.PAGE_SIZE_MIN) @Max(SystemConstant.PAGE_SIZE_MAX) Integer pageSize) throws IOException {
         return ResultUtil.ok(true);
     }
 
     @ApiOperation(value = "期末成绩编辑")
-    @RequestMapping(value = "/score/end_exam/edit", method = RequestMethod.POST)
+    @RequestMapping(value = "/final_score/edit", method = RequestMethod.POST)
     @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.EDIT)
     @ApiResponses({@ApiResponse(code = 200, message = "编辑", response = EditResult.class)})
-    public Object scoreEndExamEdit(@ApiParam(value = "主键", required = true) @RequestParam Long id) throws IOException {
+    public Object finalScoreEdit(@ApiParam(value = "主键", required = true) @RequestParam Long id) throws IOException {
         return ResultUtil.ok(true);
     }
 
     @ApiOperation(value = "期末成绩保存")
-    @RequestMapping(value = "/score/end_exam/save", method = RequestMethod.POST)
+    @RequestMapping(value = "/final_score/save", method = RequestMethod.POST)
     @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.UPDATE)
     @ApiResponses({@ApiResponse(code = 200, message = "保存", response = EditResult.class)})
-    public Object scoreEndExamSave(@ApiParam(value = "主键", required = true) @RequestParam Long id,
-                                   @ApiParam(value = "期末成绩", required = true) @RequestParam Double score,
-                                   @ApiParam(value = "期末成绩明细", required = true) @RequestParam String scoreDetail) throws IOException {
+    public Object finalScoreSave(@ApiParam(value = "主键", required = true) @RequestParam Long id,
+                                 @ApiParam(value = "期末成绩", required = true) @RequestParam Double score,
+                                 @ApiParam(value = "期末成绩明细", required = true) @RequestParam String scoreDetail) throws IOException {
         return ResultUtil.ok(true);
     }
 
     @ApiOperation(value = "期末成绩启用/禁用")
-    @RequestMapping(value = "/score/end_exam/enable", method = RequestMethod.POST)
+    @RequestMapping(value = "/final_score/enable", method = RequestMethod.POST)
     @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.UPDATE)
     @ApiResponses({@ApiResponse(code = 200, message = "编辑", response = EditResult.class)})
-    public Object scoreEndExamEnable(@ApiParam(value = "主键", required = true) @RequestParam Long id,
-                                     @ApiParam(value = "启用/禁用", required = true) @RequestParam Boolean enable) throws IOException {
+    public Object finalScoreEnable(@ApiParam(value = "主键", required = true) @RequestParam Long id,
+                                   @ApiParam(value = "启用/禁用", required = true) @RequestParam Boolean enable) throws IOException {
         return ResultUtil.ok(true);
     }
 
     @ApiOperation(value = "期末成绩试卷蓝图保存")
-    @RequestMapping(value = "/score/end_exam/paper_positive/save", method = RequestMethod.POST)
+    @RequestMapping(value = "/final_score/paper_struct/save", method = RequestMethod.POST)
     @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.UPDATE)
     @ApiResponses({@ApiResponse(code = 200, message = "试卷蓝图保存", response = Object.class)})
-    public Object scoreEndExamPaperPositiveSave(@ApiParam(value = "试卷蓝图结构", required = true) @RequestBody Object body) throws IOException {
+    public Object finalScorePaperStructSave(@ApiParam(value = "试卷蓝图结构", required = true) @RequestBody Object body) throws IOException {
         return ResultUtil.ok(true);
     }
 
     @ApiOperation(value = "期末成绩试卷蓝图查询")
-    @RequestMapping(value = "/score/end_exam/paper_positive/query", method = RequestMethod.POST)
+    @RequestMapping(value = "/final_score/paper_struct/query", method = RequestMethod.POST)
     @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.SEARCH)
     @ApiResponses({@ApiResponse(code = 200, message = "试卷蓝图保存", response = Object.class)})
-    public Object scoreEndExamPaperPositiveQuery(@ApiParam(value = "考试id", required = true) @RequestParam Long examId,
-                                                 @ApiParam(value = "科目编码", required = true) @RequestParam String courseCode,
-                                                 @ApiParam(value = "试卷编号", required = true) @RequestParam String paperNumber) throws IOException {
+    public Object finalScorePaperStructQuery(@ApiParam(value = "考试id", required = true) @RequestParam Long examId,
+                                             @ApiParam(value = "科目编码", required = true) @RequestParam String courseCode,
+                                             @ApiParam(value = "试卷编号", required = true) @RequestParam String paperNumber) throws IOException {
         return ResultUtil.ok(true);
     }
 }

distributed-print/src/main/java/com/qmth/distributed/print/api/TCScoreNormalController.java → distributed-print/src/main/java/com/qmth/distributed/print/api/TCUsualScoreController.java

@@ -10,8 +10,8 @@ import com.qmth.boot.api.exception.ApiException;
 import com.qmth.distributed.print.business.bean.excel.ExcelField;
 import com.qmth.distributed.print.business.bean.result.EditResult;
 import com.qmth.distributed.print.business.bean.result.ScoreResult;
-import com.qmth.distributed.print.business.entity.TCScoreNormal;
-import com.qmth.distributed.print.business.service.TCScoreNormalService;
+import com.qmth.distributed.print.business.entity.TCUsualScore;
+import com.qmth.distributed.print.business.service.TCUsualScoreService;
 import com.qmth.teachcloud.common.annotation.OperationLogDetail;
 import com.qmth.teachcloud.common.contant.SystemConstant;
 import com.qmth.teachcloud.common.entity.SysUser;
@@ -51,55 +51,54 @@ import java.util.*;
 @Api(tags = "课程目标达成度-成绩管理-平常作业成绩Controller")
 @RestController
 @RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + SystemConstant.PREFIX_URL_COURSE_DEGREE)
-public class TCScoreNormalController {
-    private final static Logger log = LoggerFactory.getLogger(TCScoreNormalController.class);
+public class TCUsualScoreController {
+    private final static Logger log = LoggerFactory.getLogger(TCUsualScoreController.class);
 
     @Resource
-    TCScoreNormalService tcScoreNormalService;
+    TCUsualScoreService tcUsualScoreService;
 
     @ApiOperation(value = "成绩管理列表")
     @RequestMapping(value = "/score/list", method = RequestMethod.POST)
     @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.SEARCH)
     @ApiResponses({@ApiResponse(code = 200, message = "分页查询", response = ScoreResult.class)})
-    public Object scoreList(@ApiParam(value = "学期ID", required = true) @RequestParam Long semesterId,
-                            @ApiParam(value = "考试ID", required = true) @RequestParam Long examId,
+    public Object scoreList(@ApiParam(value = "考试ID", required = true) @RequestParam Long examId,
                             @ApiParam(value = "课程编码") @RequestParam(required = false) String courseCode,
                             @ApiParam(value = "分页页码", required = true) @RequestParam @Min(SystemConstant.PAGE_NUMBER_MIN) Integer pageNumber,
                             @ApiParam(value = "分页数", required = true) @RequestParam @Min(SystemConstant.PAGE_SIZE_MIN) @Max(SystemConstant.PAGE_SIZE_MAX) Integer pageSize) {
-        return ResultUtil.ok(tcScoreNormalService.scoreList(new Page<>(pageNumber, pageSize), semesterId, examId, courseCode));
+        return ResultUtil.ok(tcUsualScoreService.scoreList(new Page<>(pageNumber, pageSize), examId, courseCode));
     }
 
     @ApiOperation(value = "导入平时成绩-模板下载")
-    @RequestMapping(value = "/score/template_download", method = RequestMethod.POST)
+    @RequestMapping(value = "/usual_score/template_download", method = RequestMethod.POST)
     @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.EXPORT)
     @ApiResponses({@ApiResponse(code = 200, message = "下载成功", response = Object.class)})
-    public void templateDownload(@ApiParam(value = "考试id", required = true) @RequestParam Long examId,
+    public void usualScoreTemplateDownload(@ApiParam(value = "考试id", required = true) @RequestParam Long examId,
                                  @ApiParam(value = "科目编码", required = true) @RequestParam String courseCode,
                                  @ApiParam(value = "试卷编号", required = true) @RequestParam String paperNumber) throws IOException {
         List<ExcelField> excelFieldList = new ArrayList<>();
-        excelFieldList.add(new ExcelField("examNumber", "学号", true));
+        excelFieldList.add(new ExcelField("studentCode", "学号", true));
         excelFieldList.add(new ExcelField("name", "姓名", true));
         excelFieldList.add(new ExcelField("score1", "作业1", true));
         excelFieldList.add(new ExcelField("score2", "作业2", true));
         excelFieldList.add(new ExcelField("score3", "作业3", false));
-        tcScoreNormalService.downLoadExaminationTemplate("1、所有字段均为必填字段；\n" +
+        tcUsualScoreService.downLoadExaminationTemplate("1、所有字段均为必填字段；\n" +
                 "2、平时成绩各项数据均需要填写；\n" +
                 "3、请不要删除此行，也不要删除模板中的任何列。\n" +
                 "4、使用前请先删除样例数据。", "sheet1", "平时成绩导入模版", excelFieldList);
     }
 
     @ApiOperation(value = "导入平时成绩")
-    @RequestMapping(value = "/score/import", method = RequestMethod.POST)
+    @RequestMapping(value = "/usual_score/import", method = RequestMethod.POST)
     @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.IMPORT)
     @ApiResponses({@ApiResponse(code = 200, message = "导入成功", response = EditResult.class)})
     @Transactional
-    public Object scoreImport(@ApiParam(value = "上传文件", required = true) @RequestParam MultipartFile file,
+    public Object usualScoreImport(@ApiParam(value = "上传文件", required = true) @RequestParam MultipartFile file,
                               @ApiParam(value = "考试id", required = true) @RequestParam Long examId,
                               @ApiParam(value = "科目编码", required = true) @RequestParam String courseCode,
                               @ApiParam(value = "试卷编号", required = true) @RequestParam String paperNumber) throws IOException {
         log.debug("导入Excel开始...");
         long start = System.currentTimeMillis();
-        MarkPaper markPaper = tcScoreNormalService.importExcelVaild(file, examId, paperNumber);
+        MarkPaper markPaper = tcUsualScoreService.importExcelVaild(file, examId, paperNumber);
 
         Map<String, String> messageMap = new LinkedHashMap<>();
         try {
@@ -109,7 +108,7 @@ public class TCScoreNormalController {
             log.info("list:{}", JacksonUtil.parseJson(list));
 
             SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
-            List<TCScoreNormal> tcScoreNormalList = new ArrayList<>(list.size());
+            List<TCUsualScore> tcUsualScoreList = new ArrayList<>(list.size());
             Map<String, String> headMap = list.get(0);
             for (Map.Entry<String, String> entry : headMap.entrySet()) {
                 if (Objects.equals(entry.getKey(), 0) && Objects.nonNull(entry.getValue()) &&
@@ -125,7 +124,7 @@ public class TCScoreNormalController {
                 Map<String, String> objectMap = list.get(i);
                 boolean error = false;
                 JSONArray jsonArray = new JSONArray();
-                TCScoreNormal tcScoreNormal = new TCScoreNormal(examId, courseCode, markPaper.getCourseName(), paperNumber, sysUser.getId());
+                TCUsualScore tcUsualScore = new TCUsualScore(examId, courseCode, markPaper.getCourseName(), paperNumber, sysUser.getId());
                 for (Map.Entry<String, String> entry : objectMap.entrySet()) {
                     JSONObject jsonObject = new JSONObject();
                     if (Objects.isNull(entry.getValue()) || Objects.equals(entry.getValue().trim(), "")) {
@@ -135,9 +134,9 @@ public class TCScoreNormalController {
                         String head = headMap.get(entry.getKey());
                         Objects.requireNonNull(head, "表头信息异常");
                         if (Objects.equals(head.trim(), "学号")) {
-                            tcScoreNormal.setExamNumber(entry.getValue());
+                            tcUsualScore.setStudentCode(entry.getValue());
                         } else if (Objects.equals(head.trim(), "姓名")) {
-                            tcScoreNormal.setName(entry.getValue());
+                            tcUsualScore.setName(entry.getValue());
                         } else {
                             jsonObject.put("name", headMap.get(entry.getKey()));
                             jsonObject.put("score", entry.getValue());
@@ -146,22 +145,22 @@ public class TCScoreNormalController {
                     }
                 }
                 if (jsonArray.size() > 0) {
-                    tcScoreNormal.setScoreNormal(jsonArray.toJSONString());
+                    tcUsualScore.setScore(jsonArray.toJSONString());
                 }
                 if (!error) {
-                    tcScoreNormalList.add(tcScoreNormal);
+                    tcUsualScoreList.add(tcUsualScore);
                 }
             }
-            if (!CollectionUtils.isEmpty(tcScoreNormalList)) {
-                successData.add("共导入" + tcScoreNormalList.size() + "条数据");
+            if (!CollectionUtils.isEmpty(tcUsualScoreList)) {
+                successData.add("共导入" + tcUsualScoreList.size() + "条数据");
 
-                QueryWrapper<TCScoreNormal> tcScoreNormalQueryWrapper = new QueryWrapper<>();
-                tcScoreNormalQueryWrapper.lambda().eq(TCScoreNormal::getExamId, examId)
-                        .eq(TCScoreNormal::getCourseCode, courseCode)
-                        .eq(TCScoreNormal::getCourseName, markPaper.getCourseName())
-                        .eq(TCScoreNormal::getPaperNumber, paperNumber);
-                tcScoreNormalService.remove(tcScoreNormalQueryWrapper);
-                tcScoreNormalService.saveBatch(tcScoreNormalList);
+                QueryWrapper<TCUsualScore> tcScoreNormalQueryWrapper = new QueryWrapper<>();
+                tcScoreNormalQueryWrapper.lambda().eq(TCUsualScore::getExamId, examId)
+                        .eq(TCUsualScore::getCourseCode, courseCode)
+                        .eq(TCUsualScore::getCourseName, markPaper.getCourseName())
+                        .eq(TCUsualScore::getPaperNumber, paperNumber);
+                tcUsualScoreService.remove(tcScoreNormalQueryWrapper);
+                tcUsualScoreService.saveBatch(tcUsualScoreList);
             }
             messageMap.put("正确信息", successData.length() > 0 ? successData.toString() : "无");
             messageMap.put("错误信息", errorData.length() > 0 ? errorData.toString() : "无");
@@ -184,10 +183,10 @@ public class TCScoreNormalController {
     }
 
     @ApiOperation(value = "平时成绩列表")
-    @RequestMapping(value = "/score/normal/list", method = RequestMethod.POST)
+    @RequestMapping(value = "/usual_score/list", method = RequestMethod.POST)
     @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.SEARCH)
     @ApiResponses({@ApiResponse(code = 200, message = "分页查询", response = EditResult.class)})
-    public Object scoreNormalList(@ApiParam(value = "考试id", required = true) @RequestParam Long examId,
+    public Object usualScoreList(@ApiParam(value = "考试id", required = true) @RequestParam Long examId,
                                   @ApiParam(value = "科目编码", required = true) @RequestParam String courseCode,
                                   @ApiParam(value = "试卷编号", required = true) @RequestParam String paperNumber,
                                   @ApiParam(value = "分页页码", required = true) @RequestParam @Min(SystemConstant.PAGE_NUMBER_MIN) Integer pageNumber,
@@ -196,27 +195,27 @@ public class TCScoreNormalController {
     }
 
     @ApiOperation(value = "平时成绩编辑")
-    @RequestMapping(value = "/score/normal/edit", method = RequestMethod.POST)
+    @RequestMapping(value = "/usual_score/edit", method = RequestMethod.POST)
     @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.EDIT)
     @ApiResponses({@ApiResponse(code = 200, message = "编辑", response = EditResult.class)})
-    public Object scoreNormalEdit(@ApiParam(value = "主键", required = true) @RequestParam Long id) throws IOException {
+    public Object usualScoreEdit(@ApiParam(value = "主键", required = true) @RequestParam Long id) throws IOException {
         return ResultUtil.ok(true);
     }
 
     @ApiOperation(value = "平时成绩保存")
-    @RequestMapping(value = "/score/normal/save", method = RequestMethod.POST)
+    @RequestMapping(value = "/usual_score/save", method = RequestMethod.POST)
     @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.UPDATE)
     @ApiResponses({@ApiResponse(code = 200, message = "保存", response = EditResult.class)})
-    public Object scoreNormalSave(@ApiParam(value = "主键", required = true) @RequestParam Long id,
+    public Object usualScoreSave(@ApiParam(value = "主键", required = true) @RequestParam Long id,
                                   @ApiParam(value = "平时成绩json", required = true) @RequestParam String socreNormal) throws IOException {
         return ResultUtil.ok(true);
     }
 
     @ApiOperation(value = "平时成绩启用/禁用")
-    @RequestMapping(value = "/score/normal/enable", method = RequestMethod.POST)
+    @RequestMapping(value = "/usual_score/enable", method = RequestMethod.POST)
     @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.UPDATE)
     @ApiResponses({@ApiResponse(code = 200, message = "编辑", response = EditResult.class)})
-    public Object scoreNormalEnable(@ApiParam(value = "主键", required = true) @RequestParam Long id,
+    public Object usualScoreEnable(@ApiParam(value = "主键", required = true) @RequestParam Long id,
                                     @ApiParam(value = "启用/禁用", required = true) @RequestParam Boolean enable) throws IOException {
         return ResultUtil.ok(true);
     }

distributed-print/src/main/java/com/qmth/distributed/print/api/TRBasicInfoController.java

@@ -3,7 +3,7 @@ package com.qmth.distributed.print.api;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.qmth.boot.api.constant.ApiConstant;
 import com.qmth.distributed.print.business.bean.result.ScoreResult;
-import com.qmth.distributed.print.business.service.TCScoreNormalService;
+import com.qmth.distributed.print.business.service.TCUsualScoreService;
 import com.qmth.teachcloud.common.annotation.OperationLogDetail;
 import com.qmth.teachcloud.common.contant.SystemConstant;
 import com.qmth.teachcloud.common.enums.log.CustomizedOperationTypeEnum;
@@ -30,18 +30,17 @@ import java.io.IOException;
 public class TRBasicInfoController {
 
     @Resource
-    TCScoreNormalService tcScoreNormalService;
+    TCUsualScoreService tcUsualScoreService;
 
     @ApiOperation(value = "报告管理列表")
     @RequestMapping(value = "/report/list", method = RequestMethod.POST)
     @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.SEARCH)
     @ApiResponses({@ApiResponse(code = 200, message = "分页查询", response = ScoreResult.class)})
-    public Object reportList(@ApiParam(value = "学期ID", required = true) @RequestParam Long semesterId,
-                             @ApiParam(value = "考试ID", required = true) @RequestParam Long examId,
+    public Object reportList(@ApiParam(value = "考试ID", required = true) @RequestParam Long examId,
                              @ApiParam(value = "课程编码") @RequestParam(required = false) String courseCode,
                              @ApiParam(value = "分页页码", required = true) @RequestParam @Min(SystemConstant.PAGE_NUMBER_MIN) Integer pageNumber,
                              @ApiParam(value = "分页数", required = true) @RequestParam @Min(SystemConstant.PAGE_SIZE_MIN) @Max(SystemConstant.PAGE_SIZE_MAX) Integer pageSize) {
-        return ResultUtil.ok(tcScoreNormalService.scoreList(new Page<>(pageNumber, pageSize), semesterId, examId, courseCode));
+        return ResultUtil.ok(tcUsualScoreService.scoreList(new Page<>(pageNumber, pageSize), examId, courseCode));
     }
 
     @ApiOperation(value = "查看报告")