Преглед изворни кода

3.4.1 驳回命题重新申请修改考试对象,返回参数原对象参数

xiaofei пре 10 месеци
родитељ
комит
10335098b1

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

@@ -38,6 +38,7 @@ public class ExamTaskDetailCardDto {
     private String printContent;
     private String auditContent;
     private Boolean review;
+    private String requestBody;
 
     public FlowStatusEnum getFlowStatus() {
         return flowStatus;
@@ -265,4 +266,12 @@ public class ExamTaskDetailCardDto {
     public void setAuditContent(String auditContent) {
         this.auditContent = auditContent;
     }
+
+    public String getRequestBody() {
+        return requestBody;
+    }
+
+    public void setRequestBody(String requestBody) {
+        this.requestBody = requestBody;
+    }
 }

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

@@ -144,6 +144,10 @@ public class ExamTask extends BaseEntity implements Serializable {
     @TableField(value = "source")
     private ExamTaskSourceEnum source;
 
+    @ApiModelProperty(value = "入库申请请求参数")
+    @TableField(value = "request_body")
+    private String requestBody;
+
     @TableField(exist = false)
     private Long examStartTime;
 
@@ -404,4 +408,12 @@ public class ExamTask extends BaseEntity implements Serializable {
     public void setSource(ExamTaskSourceEnum source) {
         this.source = source;
     }
+
+    public String getRequestBody() {
+        return requestBody;
+    }
+
+    public void setRequestBody(String requestBody) {
+        this.requestBody = requestBody;
+    }
 }

+ 1 - 0
distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/ExamTaskServiceImpl.java

@@ -1073,6 +1073,7 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
             examTask.setStatus(ExamStatusEnum.SUBMIT);
             examTask.setSource(ExamTaskSourceEnum.SELF);
             examTask.insertInfo(sysUser.getId());
+            examTask.setRequestBody(JSON.toJSONString(examTaskSubmitPram));
 
             if (Objects.isNull(examTask.getFlowId())) {
                 if (Objects.nonNull(basicPrintConfig.getReview()) && basicPrintConfig.getReview()) {

+ 4 - 2
distributed-print-business/src/main/resources/db/log/xf.sql

@@ -27,7 +27,7 @@ INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence
 INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `enable`, `default_auth`, `front_display`) VALUES ('1186', '打回历史列表查询', '/api/admin/mark/reject/list', 'URL', '917', '26', 'AUTH', '1', '1', '1');
 UPDATE `sys_privilege` SET `related` = '928,929,932,933,934,935,936,937,938,939,940,941,942,943,964,965,966,967,968,1008,1183,1186' WHERE (`id` = '944');
 
-CREATE TABLE `mark_reject_history`  (
+CREATE TABLE `mark_reject_history`(
       `id` bigint NOT NULL,
       `exam_id` bigint NULL DEFAULT NULL COMMENT '考试ID',
       `paper_number` varchar(45) NULL DEFAULT NULL COMMENT '试卷编号',
@@ -48,4 +48,6 @@ CREATE TABLE `mark_reject_history`  (
       PRIMARY KEY (`id`) USING BTREE,
       INDEX `index2`(`task_id` ASC) USING BTREE,
       INDEX `index1`(`exam_id` ASC, `paper_number` ASC, `group_number` ASC) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = DYNAMIC;
+) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = DYNAMIC;
+
+ALTER TABLE `exam_task` ADD COLUMN `request_body` MEDIUMTEXT NULL COMMENT '入库申请请求参数' AFTER `source`;

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

@@ -591,7 +591,8 @@
             a.draw_count drawCount,
             e.flow_id flowId,
             f.setup,
-            f.status as flowStatus
+            f.status as flowStatus,
+            e.request_body
         FROM
             exam_task e
                 left JOIN