测试bug

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

@@ -90,7 +90,7 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
         UpdateWrapper<ExamTask> updateWrapper = new UpdateWrapper<>();
         ExamTask task = this.getById(examTask.getId());
         // 指派命题老师
-        if (task.getStatus().name().equals(ExamStatusEnum.NEW)) {
+        if (task.getStatus().name().equals(ExamStatusEnum.NEW.name())) {
             if (!task.getEnable()) {
                 throw ExceptionResultEnum.ERROR.exception("命题任务已禁用，不能指派命题老师");
             }
@@ -98,7 +98,7 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
         }
 
         // 更改命题老师
-        if (task.getStatus().name().equals(ExamStatusEnum.READY)) {
+        if (task.getStatus().name().equals(ExamStatusEnum.READY.name())) {
             if (task.getEnable()) {
                 throw ExceptionResultEnum.ERROR.exception("命题任务禁用后，才能更改命题老师");
             }
@@ -290,19 +290,22 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
             if (StringUtils.isBlank(examTaskDetail.getPaperConfirmAttachmentIds())) {
                 throw ExceptionResultEnum.ERROR.exception("入库审核ID不能为空");
             }
-            QueryWrapper<ExamTaskDetail> queryWrapper = new QueryWrapper<>();
-            queryWrapper.lambda().eq(ExamTaskDetail::getExamTaskId, examTaskDetail.getExamTaskId());
-            ExamTaskDetail detail = examTaskDetailService.getOne(queryWrapper);
-            if (detail != null) {
-                examTaskDetail.setId(detail.getId());
-            }
         }
 
         // 更新examTask状态status
         ExamTask examTask = this.getById(examTaskDetail.getExamTaskId());
         if (examTask.getStatus().name().equals(ExamStatusEnum.SUBMIT.name()) && !examTask.getReview()) {
             examTask.setStatus(ExamStatusEnum.FINISH);
-            this.updateById(examTask);
+        }
+
+        examTask.setStatus(ExamStatusEnum.valueOf(examTaskDetail.getOperateType()));
+        this.updateById(examTask);
+
+        QueryWrapper<ExamTaskDetail> queryWrapper = new QueryWrapper<>();
+        queryWrapper.lambda().eq(ExamTaskDetail::getExamTaskId, examTaskDetail.getExamTaskId());
+        ExamTaskDetail detail = examTaskDetailService.getOne(queryWrapper);
+        if (detail != null) {
+            examTaskDetail.setId(detail.getId());
         }
 
         return examTaskDetailService.saveOrUpdate(examTaskDetail);

distributed-print-business/src/main/java/com/qmth/distributed/print/business/util/OssUtil.java

@@ -55,7 +55,7 @@ public class OssUtil {
             // 设置MD5校验。
             meta.setContentMD5(md5);
         }
-        PutObjectRequest putObjectRequest = new PutObjectRequest(this.aliYunOssDomain.getBucket(), dirName, inputStream);
+        PutObjectRequest putObjectRequest = new PutObjectRequest(this.aliYunOssDomain.getBucket(), dirName.replaceAll("\\\\", "/"), inputStream);
         PutObjectResult por = this.ossClient.putObject(putObjectRequest);
         log.info("dirName:{},requestid:{}", dirName, por.getRequestId());
     }

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

@@ -38,7 +38,7 @@
             a.specialty,
             a.paper_number paperNumber,
             a.card_rule_id cardRuleId,
-            case a.card_rule _id when -1 then '全部通卡' else b.name end cardRuleName,
+            case a.card_rule_id when -1 then '全部通卡' else b.name end cardRuleName,
             a.user_id userId,
             c.real_name userName,
             a.start_time startTime,
@@ -112,9 +112,9 @@
             a.end_time endTime,
             a.status,
             CASE
-                WHEN a.review = 0 THEN ''
-                WHEN a.review = 1 AND a.review_status IS NULL THEN 'NOT_AUDITED'
-                ELSE 'AUDITED'
+                WHEN a.review = 1 AND a.status = 'SUBMIT' THEN 'NOT_AUDITED'
+                WHEN a.review = 1 AND a.status IN ('STAGE', 'FINISH') AND  a.review_status IS NOT NULL THEN 'AUDITED'
+                ELSE ''
             END auditStatus,
             CASE
                 WHEN a.review_status IS NULL THEN ''

distributed-print-common/src/main/java/com/qmth/distributed/print/common/util/Result.java

@@ -11,7 +11,7 @@ import java.io.Serializable;
  * @Author: wangliang
  * @Date: 2019/10/11
  */
-@JsonInclude(JsonInclude.Include.NON_NULL)
+//@JsonInclude(JsonInclude.Include.NON_NULL)
 public class Result implements Serializable {
     private int code;
     private String message;