bug

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

@@ -98,6 +98,18 @@ public class WorkResult implements Serializable {
     @ApiModelProperty(value = "流程步骤")
     Integer setup;
 
+    @ApiModelProperty(value = "拟卷教师")
+    String teacherName;
+
+    @ApiModelProperty(value = "主讲教师")
+    String lecturerName;
+
+    @ApiModelProperty(value = "教研室")
+    String teachingRoomName;
+
+    @ApiModelProperty(value = "审核状态")
+    String auditStatus;
+
     public String getStatusStr() {
         if (Objects.nonNull(status)) {
             return status.getTitle();
@@ -293,4 +305,36 @@ public class WorkResult implements Serializable {
     public void setTaskId(Long taskId) {
         this.taskId = taskId;
     }
+
+    public String getTeacherName() {
+        return teacherName;
+    }
+
+    public void setTeacherName(String teacherName) {
+        this.teacherName = teacherName;
+    }
+
+    public String getLecturerName() {
+        return lecturerName;
+    }
+
+    public void setLecturerName(String lecturerName) {
+        this.lecturerName = lecturerName;
+    }
+
+    public String getTeachingRoomName() {
+        return teachingRoomName;
+    }
+
+    public void setTeachingRoomName(String teachingRoomName) {
+        this.teachingRoomName = teachingRoomName;
+    }
+
+    public String getAuditStatus() {
+        return auditStatus;
+    }
+
+    public void setAuditStatus(String auditStatus) {
+        this.auditStatus = auditStatus;
+    }
 }

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

@@ -1335,23 +1335,29 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
         ExamTask examTask = examTaskApplyParam.getExamTask();
         ExamTaskDetail examTaskDetail = examTaskApplyParam.getExamTaskDetail();
         try {
-            if (StringUtils.isNotBlank(examTask.getPaperNumber())) {
-                QueryWrapper<ExamTask> taskQueryWrapper = new QueryWrapper<>();
-                taskQueryWrapper.lambda().eq(ExamTask::getSchoolId, schoolId).eq(ExamTask::getPaperNumber, examTask.getPaperNumber());
-                ExamTask task = this.getOne(taskQueryWrapper);
-                if (task != null && Objects.nonNull(examTask.getId()) && examTask.getId().longValue() != task.getId().longValue()) {
-                    throw ExceptionResultEnum.ERROR.exception("试卷编号已存在");
-                }
-            } else {
-                // 试卷编号生成规则：年月日（例如：20100419）+0000（例如：0001）顺序编号
-                String paperNumber = printCommonService.createPaperNumber(schoolId);
-                examTask.setPaperNumber(paperNumber);
-            }
-
             BasicExamRule basicExamRule = basicExamRuleService.getBySchoolId();
             if (basicExamRule == null) {
                 throw ExceptionResultEnum.ERROR.exception("通用规则未设置");
             }
+
+            if(Objects.isNull(examTask.getId())) {
+                if (StringUtils.isNotBlank(examTask.getPaperNumber())) {
+                    QueryWrapper<ExamTask> taskQueryWrapper = new QueryWrapper<>();
+                    taskQueryWrapper.lambda().eq(ExamTask::getSchoolId, schoolId).eq(ExamTask::getPaperNumber, examTask.getPaperNumber());
+                    ExamTask task = this.getOne(taskQueryWrapper);
+                    if (task != null && Objects.nonNull(examTask.getId()) && examTask.getId().longValue() != task.getId().longValue()) {
+                        throw ExceptionResultEnum.ERROR.exception("试卷编号已存在");
+                    }
+                } else {
+                    // 试卷编号生成规则：年月日（例如：20100419）+0000（例如：0001）顺序编号
+                    String paperNumber = printCommonService.createPaperNumber(schoolId);
+                    examTask.setPaperNumber(paperNumber);
+                }
+            } else {
+                ExamTask task = this.getById(examTask.getId());
+                examTask.setFlowId(task.getFlowId());
+            }
+
             examTask.setId(Objects.isNull(examTask.getId()) ? SystemConstant.getDbUuid() : examTask.getId());
             examTask.setSchoolId(schoolId);
             examTask.setOrgId(sysUser.getOrgId());
@@ -1375,7 +1381,6 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
 
             // 提交时，校验
             if (ExamStatusEnum.SUBMIT.name().equals(examTaskDetail.getOperateType())) {
-
                 if (Objects.nonNull(examTask.getFlowId())) {
                     // 审核一级
                     Task task = taskService.createTaskQuery().processInstanceId(String.valueOf(examTask.getFlowId())).singleResult();
@@ -1439,6 +1444,7 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
                 examTaskDetail.setUnexposedPaperType(examTaskDetail.getPaperType());
             } else {
                 // 已曝光试卷和未曝光试卷赋值（新增时，已曝光试卷为null，未曝光试卷为paper_type）
+                examTaskDetail.setId(SystemConstant.getDbUuid());
                 examTaskDetail.setUnexposedPaperType(examTaskDetail.getPaperType());
             }
             examTaskDetail.setExamTaskId(examTask.getId());

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

@@ -174,7 +174,8 @@
         a.enable,
         a.create_id createId,
         a.create_time createTime,
-        e.setup
+        e.setup,
+        a.flow_id flowId
         FROM
         exam_task a
         LEFT JOIN
@@ -858,6 +859,7 @@
                 et.start_time startTime,
                 et.end_time endTime,
                 tffa.status,
+                tffa.status auditStatus,
                 et.enable,
                 et.update_time createTime,
                 art.EXECUTION_ID_ as executionId,
@@ -865,7 +867,10 @@
                 art.NAME_ as taskName,
                 art.TASK_DEF_KEY_ as taskDefKey,
                 art.ID_ as taskId,
-                tffa.setup
+                tffa.setup,
+                et.teacher_name teacherName,
+                et.lecturer_name lecturerName,
+                so.name teachingRoomName
             from
                 ACT_RU_TASK art
             left join exam_task et on
@@ -876,6 +881,8 @@
                 tffa.flow_id = et.flow_id
             left join sys_user c ON
                 art.ASSIGNEE_ = c.id
+            LEFT JOIN
+                sys_org so ON et.teaching_room_id = so.id
             where
                  art.ASSIGNEE_ = cast(#{userId} as char)
                 and et.school_id = #{schoolId}
@@ -898,6 +905,7 @@
                 et.start_time startTime,
                 et.end_time endTime,
                 tffa.status,
+                tffa.status auditStatus,
                 et.enable,
                 et.update_time createTime,
                 art.EXECUTION_ID_ as executionId,
@@ -905,7 +913,10 @@
                 art.NAME_ as taskName,
                 art.TASK_DEF_KEY_ as taskDefKey,
                 art.ID_ as taskId,
-                tffa.setup
+                tffa.setup,
+                et.teacher_name teacherName,
+                et.lecturer_name lecturerName,
+                so.name teachingRoomName
             from
                 ACT_RU_TASK art
             left join exam_task et on
@@ -918,6 +929,8 @@
                 tffa.flow_id = et.flow_id
             left join sys_user c ON
                 ari.USER_ID_ = c.id
+            LEFT JOIN
+                sys_org so ON et.teaching_room_id = so.id
             where
                 art.ASSIGNEE_ is null
                 and ari.USER_ID_ = cast(#{userId} as char)
@@ -942,6 +955,7 @@
                 et.start_time startTime,
                 et.end_time endTime,
                 et.flowStatus as status,
+                et.flowStatus as auditStatus,
                 et.enable,
                 et.update_time createTime,
                 et.EXECUTION_ID_ as executionId,
@@ -949,7 +963,10 @@
                 et.NAME_ as taskName,
                 et.TASK_DEF_KEY_ as taskDefKey,
                 et.ID_ as taskId,
-                et.setup
+                et.setup,
+                et.teacher_name teacherName,
+                et.lecturer_name lecturerName,
+                so.name teachingRoomName
             from
                 (
                 select
@@ -979,7 +996,9 @@
             left join basic_card_rule b ON
                 et.card_rule_id = b.id
             left join sys_user c ON
-                et.userId = c.id) t order by t.createTime desc
+                et.userId = c.id
+            LEFT JOIN
+                sys_org so ON et.teaching_room_id = so.id) t order by t.createTime desc
     </select>
 
     <select id="findFlowIdToMySelf" resultType="java.lang.Long">