3.2.6 广药新需求-增加作废原因

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/dto/ExamTaskDetailCardDto.java

@@ -15,6 +15,8 @@ public class ExamTaskDetailCardDto {
 //    private String cardId;
     private String paperConfirmAttachmentIds;
     private String remark;
+    private String taskStatus;
+    private String cancelRemark;
     private String exposedPaperType;
     private String relatePaperType;
     private String unexposedPaperType;
@@ -102,6 +104,22 @@ public class ExamTaskDetailCardDto {
         this.remark = remark;
     }
 
+    public String getTaskStatus() {
+        return taskStatus;
+    }
+
+    public void setTaskStatus(String taskStatus) {
+        this.taskStatus = taskStatus;
+    }
+
+    public String getCancelRemark() {
+        return cancelRemark;
+    }
+
+    public void setCancelRemark(String cancelRemark) {
+        this.cancelRemark = cancelRemark;
+    }
+
     public String getExposedPaperType() {
         return exposedPaperType;
     }

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

@@ -132,6 +132,9 @@ public class ExamTask extends BaseEntity implements Serializable {
     @TableField("paper_name")
     private String paperName;
 
+    @TableField("cancel_remark")
+    private String cancelRemark;
+
     @TableField(exist = false)
     private List<Map<String, String>> users;
 
@@ -347,6 +350,14 @@ public class ExamTask extends BaseEntity implements Serializable {
         this.paperName = paperName;
     }
 
+    public String getCancelRemark() {
+        return cancelRemark;
+    }
+
+    public void setCancelRemark(String cancelRemark) {
+        this.cancelRemark = cancelRemark;
+    }
+
     public List<Map<String, String>> getUsers() {
         return users;
     }

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

@@ -60,5 +60,5 @@ public interface ExamTaskDetailService extends IService<ExamTaskDetail> {
 
     ExamTaskDetail findByExamIdAndCourseCodeAndPaperNumber(Long schoolId, Long examId, String code, String number);
 
-    boolean cancel(Long id);
+    boolean cancel(Long id, String cancelRemark);
 }

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

@@ -556,12 +556,13 @@ public class ExamTaskDetailServiceImpl extends ServiceImpl<ExamTaskDetailMapper,
 
     @Transactional
     @Override
-    public boolean cancel(Long id) {
+    public boolean cancel(Long id, String cancelRemark) {
         ExamTask examTask = examTaskService.getById(id);
         String paperNumber = examTask.getPaperNumber();
         String paperNumberCancel = paperNumber + "-作废";
         examTask.setPaperNumber(paperNumberCancel);
         examTask.setStatus(ExamStatusEnum.CANCEL);
+        examTask.setCancelRemark(cancelRemark);
         examTaskService.updateById(examTask);
 
         // 作废后，考场状态改为作废，考务数据保留

distributed-print-business/src/main/resources/db/install/teachcloud_db.sql

@@ -831,6 +831,7 @@ CREATE TABLE `exam_task` (
                              `teacher_name` varchar(100) DEFAULT NULL COMMENT '拟卷教师',
                              `lecturer_name` varchar(100) DEFAULT NULL COMMENT '主讲教师',
                              `paper_name` varchar(100) DEFAULT NULL COMMENT '试卷名称',
+                             `cancel_remark` MEDIUMTEXT DEFAULT NULL COMMENT '作废原因',
                              `create_id` bigint DEFAULT NULL COMMENT '创建人',
                              `create_time` bigint DEFAULT NULL COMMENT '创建时间',
                              `update_id` bigint DEFAULT NULL COMMENT '修改人',

distributed-print-business/src/main/resources/db/log/脚本-xiaof.sql

@@ -93,3 +93,5 @@ INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence
 
 INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `related`, `enable`, `default_auth`, `front_display`) VALUES ('878', '作废', 'Cancel', 'LINK', '42', '5', 'AUTH', '879', '1', '0', '1');
 INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `enable`, `default_auth`, `front_display`) VALUES ('879', '作废', '/api/admin/exam/task/cancel', 'URL', '42', '8', 'AUTH', '1', '1', '1');
+
+ALTER TABLE `exam_task` ADD COLUMN `cancel_remark` MEDIUMTEXT NULL COMMENT '作废原因' AFTER `paper_name`;

distributed-print-business/src/main/resources/db/upgrade/3.2.6.sql

@@ -4,4 +4,6 @@ INSERT INTO `sys_privilege` VALUES (875, '我教课程选择', 'MyTeachCourse',
 INSERT INTO `sys_privilege` VALUES (876, '学生库选择', 'StudentLibrary', 'BUTTON', 40, 11, 'AUTH', '759', 1, 0, 1);
 INSERT INTO `sys_privilege` VALUES (877, '选择学生（学生库选择）', 'SelectStudent', 'BUTTON', 40, 12, 'AUTH', NULL, 1, 0, 1);
 INSERT INTO `sys_privilege` VALUES (878, '作废', 'Cancel', 'LINK', 42, 5, 'AUTH', '879', 1, 0, 1);
-INSERT INTO `sys_privilege` VALUES (879, '作废', '/api/admin/exam/task/cancel', 'URL', 42, 8, 'AUTH', NULL, 1, 1, 1);
+INSERT INTO `sys_privilege` VALUES (879, '作废', '/api/admin/exam/task/cancel', 'URL', 42, 8, 'AUTH', NULL, 1, 1, 1);
+
+ALTER TABLE `exam_task` ADD COLUMN `cancel_remark` MEDIUMTEXT NULL COMMENT '作废原因' AFTER `paper_name`;

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

@@ -616,6 +616,8 @@
         SELECT
             e.id examTaskId,
             e.exam_id examId,
+            e.status taskStatus,
+            e.cancel_remark cancelRemark,
             g.name examName,
             g.exam_model examModel,
             h.name semesterName,

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

@@ -978,8 +978,9 @@ public class ExamTaskController {
     @ApiOperation(value = "卷库查询-作废")
     @RequestMapping(value = "/cancel", method = RequestMethod.POST)
     @OperationLogDetail(customizedOperationType = CustomizedOperationTypeEnum.UPDATE)
-    public Result cancel(@RequestParam Long id) {
-        boolean isSuccess = examTaskDetailService.cancel(id);
+    public Result cancel(@RequestParam Long id,
+                         @RequestParam String cancelRemark) {
+        boolean isSuccess = examTaskDetailService.cancel(id, cancelRemark);
         return ResultUtil.ok(isSuccess);
     }
 }