去掉paperType

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/result/ScoreResult.java

@@ -36,9 +36,6 @@ public class ScoreResult implements Serializable {
     @ApiModelProperty(value = "试卷编号")
     private String paperNumber;
 
-    @ApiModelProperty(value = "试卷类型")
-    private String paperType;
-
     public Long getId() {
         return id;
     }
@@ -86,12 +83,4 @@ public class ScoreResult implements Serializable {
     public void setPaperNumber(String paperNumber) {
         this.paperNumber = paperNumber;
     }
-
-    public String getPaperType() {
-        return paperType;
-    }
-
-    public void setPaperType(String paperType) {
-        this.paperType = paperType;
-    }
 }

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

@@ -37,9 +37,6 @@ public class TCPaperPositive implements Serializable {
     @ApiModelProperty(value = "试卷编码")
     private String paperNumber;
 
-    @ApiModelProperty(value = "试卷类型")
-    private String paperType;
-
     @ApiModelProperty(value = "试卷结构")
     private String paperStruct;
 
@@ -100,14 +97,6 @@ public class TCPaperPositive implements Serializable {
         this.paperNumber = paperNumber;
     }
 
-    public String getPaperType() {
-        return paperType;
-    }
-
-    public void setPaperType(String paperType) {
-        this.paperType = paperType;
-    }
-
     public String getPaperStruct() {
         return paperStruct;
     }

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

@@ -38,9 +38,6 @@ public class TCScoreEndExam implements Serializable {
     @ApiModelProperty(value = "试卷编码")
     private String paperNumber;
 
-    @ApiModelProperty(value = "试卷类型")
-    private String paperType;
-
     @ApiModelProperty(value = "考生姓名")
     private String name;
 
@@ -74,25 +71,23 @@ public class TCScoreEndExam implements Serializable {
 
     }
 
-    public TCScoreEndExam(Long examId, String courseCode, String courseName, String paperNumber, String paperType, Long userId) {
+    public TCScoreEndExam(Long examId, String courseCode, String courseName, String paperNumber, Long userId) {
         this.id = SystemConstant.getDbUuid();
         this.examId = examId;
         this.courseCode = courseCode;
         this.courseName = courseName;
         this.paperNumber = paperNumber;
-        this.paperType = paperType;
         this.enable = true;
         this.createId = userId;
         this.createTime = System.currentTimeMillis();
     }
 
-    public TCScoreEndExam(Long examId, String courseCode, String courseName, String paperNumber, String paperType, String name, String examNumber, Double score, String scoreDetail, Long userId) {
+    public TCScoreEndExam(Long examId, String courseCode, String courseName, String paperNumber, String name, String examNumber, Double score, String scoreDetail, Long userId) {
         this.id = SystemConstant.getDbUuid();
         this.examId = examId;
         this.courseCode = courseCode;
         this.courseName = courseName;
         this.paperNumber = paperNumber;
-        this.paperType = paperType;
         this.name = name;
         this.examNumber = examNumber;
         this.score = score;
@@ -142,14 +137,6 @@ public class TCScoreEndExam implements Serializable {
         this.paperNumber = paperNumber;
     }
 
-    public String getPaperType() {
-        return paperType;
-    }
-
-    public void setPaperType(String paperType) {
-        this.paperType = paperType;
-    }
-
     public String getName() {
         return name;
     }

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

@@ -38,9 +38,6 @@ public class TCScoreNormal implements Serializable {
     @ApiModelProperty(value = "试卷编码")
     private String paperNumber;
 
-    @ApiModelProperty(value = "试卷类型")
-    private String paperType;
-
     @ApiModelProperty(value = "考生姓名")
     private String name;
 
@@ -71,25 +68,23 @@ public class TCScoreNormal implements Serializable {
 
     }
 
-    public TCScoreNormal(Long examId, String courseCode, String courseName, String paperNumber, String paperType, Long userId) {
+    public TCScoreNormal(Long examId, String courseCode, String courseName, String paperNumber, Long userId) {
         this.id = SystemConstant.getDbUuid();
         this.examId = examId;
         this.courseCode = courseCode;
         this.courseName = courseName;
         this.paperNumber = paperNumber;
-        this.paperType = paperType;
         this.enable = true;
         this.createId = userId;
         this.createTime = System.currentTimeMillis();
     }
 
-    public TCScoreNormal(Long examId, String courseCode, String courseName, String paperNumber, String paperType, String name, String examNumber, String scoreNormal, Long userId) {
+    public TCScoreNormal(Long examId, String courseCode, String courseName, String paperNumber, String name, String examNumber, String scoreNormal, Long userId) {
         this.id = SystemConstant.getDbUuid();
         this.examId = examId;
         this.courseCode = courseCode;
         this.courseName = courseName;
         this.paperNumber = paperNumber;
-        this.paperType = paperType;
         this.name = name;
         this.examNumber = examNumber;
         this.scoreNormal = scoreNormal;
@@ -138,14 +133,6 @@ public class TCScoreNormal implements Serializable {
         this.paperNumber = paperNumber;
     }
 
-    public String getPaperType() {
-        return paperType;
-    }
-
-    public void setPaperType(String paperType) {
-        this.paperType = paperType;
-    }
-
     public String getName() {
         return name;
     }

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

@@ -37,9 +37,6 @@ public class TRBasicInfo implements Serializable {
     @ApiModelProperty(value = "试卷编码")
     private String paperNumber;
 
-    @ApiModelProperty(value = "试卷类型")
-    private String paperType;
-
     @ApiModelProperty(value = "课程性质")
     private String courseType;
 
@@ -136,14 +133,6 @@ public class TRBasicInfo implements Serializable {
         this.paperNumber = paperNumber;
     }
 
-    public String getPaperType() {
-        return paperType;
-    }
-
-    public void setPaperType(String paperType) {
-        this.paperType = paperType;
-    }
-
     public String getCourseType() {
         return courseType;
     }

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

@@ -50,8 +50,7 @@ public interface TCScoreNormalService extends IService<TCScoreNormal> {
      * @param file
      * @param examId
      * @param paperNumber
-     * @param paperType
      * @return
      */
-    public MarkPaper importExcelVaild(MultipartFile file, Long examId, String paperNumber, String paperType) throws IOException;
+    public MarkPaper importExcelVaild(MultipartFile file, Long examId, String paperNumber) throws IOException;
 }

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

@@ -166,17 +166,16 @@ public class TCScoreNormalServiceImpl extends ServiceImpl<TCScoreNormalMapper, T
      * @param file
      * @param examId
      * @param paperNumber
-     * @param paperType
      * @return
      */
     @Override
-    public MarkPaper importExcelVaild(MultipartFile file, Long examId, String paperNumber, String paperType) throws IOException {
+    public MarkPaper importExcelVaild(MultipartFile file, Long examId, String paperNumber) throws IOException {
         String reqFileMd5 = ServletUtil.getRequestMd5();
         String fileMd5 = DigestUtils.md5Hex(file.getBytes());
         if (!Objects.equals(fileMd5, reqFileMd5)) {
             throw ExceptionResultEnum.MD5_EQUALS_FALSE.exception();
         }
-        MarkPaper markPaper = markPaperService.getByExamIdAndPaperNumberAndPaperType(examId, paperNumber, paperType);
+        MarkPaper markPaper = markPaperService.getByExamIdAndPaperNumber(examId, paperNumber);
         Objects.requireNonNull(markPaper, "未找到科目信息");
         return markPaper;
     }

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

@@ -8,8 +8,7 @@
                  t.exam_id as examId,
                  t.course_code as courseCode,
                  t.course_name as courseName,
-                 t.paper_number as paperNumber,
-                 t.paper_type as paperType
+                 t.paper_number as paperNumber
         FROM
             mark_paper t
             left join basic_exam be on be.id = t.exam_id
@@ -26,6 +25,6 @@
             </if>
             AND t.status = 'FINISH'
         </where>
-        ORDER BY t.course_code,t.paper_type
+        ORDER BY t.course_code
     </select>
 </mapper>

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

@@ -123,7 +123,6 @@ CREATE TABLE `t_c_paper_positive` (
                                       `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 '试卷编码',
-                                      `paper_type` varchar(50) COLLATE utf8mb4_general_ci NOT NULL COMMENT '试卷类型',
                                       `paper_struct` mediumtext NOT NULL COMMENT '试卷结构',
                                       `enable` tinyint NOT NULL DEFAULT '1' COMMENT '是否启用，0：停用，1：启用',
                                       `create_id` bigint DEFAULT NULL COMMENT '创建人id',
@@ -140,7 +139,6 @@ CREATE TABLE `t_c_score_end_exam` (
                                       `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 '试卷编码',
-                                      `paper_type` varchar(50) 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` double NOT NULL COMMENT '分数',
@@ -151,7 +149,7 @@ CREATE TABLE `t_c_score_end_exam` (
                                       `update_id` bigint DEFAULT NULL COMMENT '更新人id',
                                       `update_time` bigint DEFAULT NULL COMMENT '更新时间',
                                       PRIMARY KEY (`id`),
-                                      UNIQUE KEY `t_c_score_end_exam_unique` (`exam_id`,`course_code`,`course_name`,`paper_number`,`paper_type`,`name`,`exam_number`)
+                                      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`;
@@ -161,7 +159,6 @@ CREATE TABLE `t_c_score_normal` (
                                     `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 '试卷编码',
-                                    `paper_type` varchar(50) 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 '平常作业分数',
@@ -171,7 +168,7 @@ CREATE TABLE `t_c_score_normal` (
                                     `update_id` bigint DEFAULT NULL COMMENT '更新人id',
                                     `update_time` bigint DEFAULT NULL COMMENT '更新时间',
                                     PRIMARY KEY (`id`),
-                                    UNIQUE KEY `t_c_score_normal_unique` (`exam_id`,`course_code`,`course_name`,`paper_number`,`paper_type`,`name`,`exam_number`)
+                                    UNIQUE KEY `t_c_score_normal_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_r_basic_info`;
@@ -181,7 +178,6 @@ CREATE TABLE `t_r_basic_info` (
                                   `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 '试卷编码',
-                                  `paper_type` varchar(50) COLLATE utf8mb4_general_ci NOT NULL COMMENT '试卷类型',
                                   `course_type` varchar(100) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '课程性质',
                                   `evaluation_mode` varchar(100) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '考核方式',
                                   `open_time` varchar(100) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '开课时间',

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

@@ -62,8 +62,7 @@ public class TCScoreEndExamController {
     @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,
-                                        @ApiParam(value = "试卷类型", required = true) @RequestParam String paperType) throws IOException {
+                                        @ApiParam(value = "试卷编号", required = true) @RequestParam String paperNumber) throws IOException {
         List<ExcelField> excelFieldList = new ArrayList<>();
         excelFieldList.add(new ExcelField("examNumber", "学号", true));
         excelFieldList.add(new ExcelField("name", "姓名", true));
@@ -84,11 +83,10 @@ public class TCScoreEndExamController {
     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,
-                                     @ApiParam(value = "试卷类型", required = true) @RequestParam String paperType) throws IOException {
+                                     @ApiParam(value = "试卷编号", required = true) @RequestParam String paperNumber) throws IOException {
         log.debug("导入Excel开始...");
         long start = System.currentTimeMillis();
-        MarkPaper markPaper = tcScoreNormalService.importExcelVaild(file, examId, paperNumber, paperType);
+        MarkPaper markPaper = tcScoreNormalService.importExcelVaild(file, examId, paperNumber);
 
         Map<String, String> messageMap = new LinkedHashMap<>();
         try {
@@ -117,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, paperType, sysUser.getId());
+                TCScoreEndExam tcScoreEndExam = new TCScoreEndExam(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(), "")) {
@@ -153,8 +151,7 @@ public class TCScoreEndExamController {
                 tcScoreEndExamQueryWrapper.lambda().eq(TCScoreEndExam::getExamId, examId)
                         .eq(TCScoreEndExam::getCourseCode, courseCode)
                         .eq(TCScoreEndExam::getCourseName, markPaper.getCourseName())
-                        .eq(TCScoreEndExam::getPaperNumber, paperNumber)
-                        .eq(TCScoreEndExam::getPaperType, paperType);
+                        .eq(TCScoreEndExam::getPaperNumber, paperNumber);
                 tcScoreEndExamService.remove(tcScoreEndExamQueryWrapper);
                 tcScoreEndExamService.saveBatch(tcScoreEndExamList);
             }
@@ -185,7 +182,6 @@ public class TCScoreEndExamController {
     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 String paperType,
                                    @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);
@@ -232,8 +228,7 @@ public class TCScoreEndExamController {
     @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,
-                                                 @ApiParam(value = "试卷类型", required = true) @RequestParam String paperType) throws IOException {
+                                                 @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

@@ -75,8 +75,7 @@ public class TCScoreNormalController {
     @ApiResponses({@ApiResponse(code = 200, message = "下载成功", response = Object.class)})
     public void templateDownload(@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 String paperType) throws IOException {
+                                 @ApiParam(value = "试卷编号", required = true) @RequestParam String paperNumber) throws IOException {
         List<ExcelField> excelFieldList = new ArrayList<>();
         excelFieldList.add(new ExcelField("examNumber", "学号", true));
         excelFieldList.add(new ExcelField("name", "姓名", true));
@@ -97,11 +96,10 @@ public class TCScoreNormalController {
     public Object scoreImport(@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,
-                              @ApiParam(value = "试卷类型", required = true) @RequestParam String paperType) throws IOException {
+                              @ApiParam(value = "试卷编号", required = true) @RequestParam String paperNumber) throws IOException {
         log.debug("导入Excel开始...");
         long start = System.currentTimeMillis();
-        MarkPaper markPaper = tcScoreNormalService.importExcelVaild(file, examId, paperNumber, paperType);
+        MarkPaper markPaper = tcScoreNormalService.importExcelVaild(file, examId, paperNumber);
 
         Map<String, String> messageMap = new LinkedHashMap<>();
         try {
@@ -127,7 +125,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, paperType, sysUser.getId());
+                TCScoreNormal tcScoreNormal = new TCScoreNormal(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(), "")) {
@@ -161,8 +159,7 @@ public class TCScoreNormalController {
                 tcScoreNormalQueryWrapper.lambda().eq(TCScoreNormal::getExamId, examId)
                         .eq(TCScoreNormal::getCourseCode, courseCode)
                         .eq(TCScoreNormal::getCourseName, markPaper.getCourseName())
-                        .eq(TCScoreNormal::getPaperNumber, paperNumber)
-                        .eq(TCScoreNormal::getPaperType, paperType);
+                        .eq(TCScoreNormal::getPaperNumber, paperNumber);
                 tcScoreNormalService.remove(tcScoreNormalQueryWrapper);
                 tcScoreNormalService.saveBatch(tcScoreNormalList);
             }
@@ -193,7 +190,6 @@ public class TCScoreNormalController {
     public Object scoreNormalList(@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 String paperType,
                                   @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);

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

@@ -50,8 +50,7 @@ public class TRBasicInfoController {
     @ApiResponses({@ApiResponse(code = 200, message = "查看报告", response = Object.class)})
     public Object reportView(@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 String paperType) {
+                             @ApiParam(value = "试卷编号", required = true) @RequestParam String paperNumber) {
         return ResultUtil.ok(true);
     }
 
@@ -70,8 +69,7 @@ public class TRBasicInfoController {
     @ApiResponses({@ApiResponse(code = 200, message = "下载成功", response = Object.class)})
     public void reportExport(@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 String paperType) throws IOException {
+                             @ApiParam(value = "试卷编号", required = true) @RequestParam String paperNumber) throws IOException {
 
     }
 }