评价管理优化接口

src/main/java/com/xjrsoft/module/evaluate/dto/EvaluateResultSaveDto.java

@@ -26,6 +26,9 @@ public class EvaluateResultSaveDto implements Serializable {
     @ApiModelProperty(value = "评价类型")
     private String evaluateType;
 
+    @ApiModelProperty(value = "提交类型：1=暂存，2=提交")
+    private Integer submitType;
+
     @ApiModelProperty(value = "填写答案信息")
     private List<AddEvaluateResultDto> resultList;
 }

src/main/java/com/xjrsoft/module/evaluate/service/impl/EvaluateManageServiceImpl.java

@@ -134,7 +134,7 @@ public class EvaluateManageServiceImpl extends MPJBaseServiceImpl<EvaluateManage
             //评价提交记录的id集合
             List<String> submitRecordIdList = new ArrayList<>();
             for (MobileResultPageVo mobileResultPageVo : mobileResultPage.getRecords()) {
-                if(mobileResultPageVo.getEvaluateStatus() == 1){
+                if(mobileResultPageVo.getEvaluateStatus() == 2){
                     submitRecordIdList.add(mobileResultPageVo.getEvaluateSubmitRecordId());
                 }
             }

src/main/java/com/xjrsoft/module/evaluate/service/impl/EvaluateObjectServiceImpl.java

@@ -1,7 +1,9 @@
 package com.xjrsoft.module.evaluate.service.impl;
 
+import camundajar.impl.scala.runtime.LambdaDeserialize;
 import cn.dev33.satoken.stp.StpUtil;
 import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.github.yulichang.base.MPJBaseServiceImpl;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import com.xjrsoft.common.enums.DeleteMark;
@@ -99,6 +101,18 @@ public class EvaluateObjectServiceImpl extends MPJBaseServiceImpl<EvaluateObject
     @Override
     @Transactional
     public Boolean objectGradeDelete(ObjectGradeDeleteDto dto) {
+        //获取当前评价管理的类型
+        LambdaQueryWrapper<EvaluateManage> evaluateManageMPJLambdaWrapper = new LambdaQueryWrapper<>();
+        evaluateManageMPJLambdaWrapper
+                .eq(EvaluateManage::getId, dto.getEvaluateManageId());
+        EvaluateManage evaluateManage = evaluateManageMapper.selectOne(evaluateManageMPJLambdaWrapper);
+        if(evaluateManage == null){
+            throw new MyException("该评价管理已经失效");
+        }
+
+        if(evaluateManage.getStatus() != -1){
+            throw new MyException("该评价管理正在使用");
+        }
         evaluateObjectMapper.objectGradeDeleteExecuter(dto);
         evaluateObjectMapper.objectGradeDeleteObject(dto);
         return true;
@@ -120,7 +134,7 @@ public class EvaluateObjectServiceImpl extends MPJBaseServiceImpl<EvaluateObject
         }
 
         if(evaluateManageVo.getStatus() != -1){
-            throw new MyException("改评价已经使用");
+            throw new MyException("该评价正在使用");
         }
 
         //清空原有数据

src/main/java/com/xjrsoft/module/evaluate/service/impl/EvaluateResultServiceImpl.java

@@ -278,7 +278,7 @@ public class EvaluateResultServiceImpl extends MPJBaseServiceImpl<EvaluateResult
             return "该评价已失效！";
         }
 
-        if(mobileResultPageVo.getEvaluateStatus() == 1){
+        if(mobileResultPageVo.getEvaluateStatus() == 2){
             return "已经评价，请勿重复评价";
         }
 
@@ -300,13 +300,21 @@ public class EvaluateResultServiceImpl extends MPJBaseServiceImpl<EvaluateResult
             //修改答题人状态
             evaluateExecuterMapper.updateById(new EvaluateExecuter(){{
                 setId(Long.parseLong(mobileResultPageVo.getEvaluateUserId()));
-                setStatus(1);
+                if(dto.getSubmitType() != null && dto.getSubmitType() == 1){
+                    setStatus(1);
+                } else {
+                    setStatus(2);
+                }
             }});
 
             //修改提交记录状态
             evaluateSubmitRecordMapper.updateById(new EvaluateSubmitRecord(){{
                 setId(mobileResultPageVo.getEvaluateSubmitRecordId());
-                setStatus(1);
+                if(dto.getSubmitType() != null && dto.getSubmitType() == 1){
+                    setStatus(1);
+                } else {
+                    setStatus(2);
+                }
             }});
         }
 

src/main/java/com/xjrsoft/module/evaluate/vo/DrillEvaluateClassListVo.java

@@ -82,6 +82,6 @@ public class DrillEvaluateClassListVo {
     @ApiModelProperty("题目数量")
     private Integer itemCount;
 
-    @ApiModelProperty("评价状态（0：未评价，1：已评价）")
+    @ApiModelProperty("评价状态（0：未评价，1：暂存，2：已评价）")
     private Integer evaluateStatus;
 }

src/main/java/com/xjrsoft/module/evaluate/vo/MobileResultPageVo.java

@@ -85,7 +85,7 @@ public class MobileResultPageVo {
     @ApiModelProperty("总分")
     private Double totalScore;
 
-    @ApiModelProperty("评价状态（0：未评价，1：已评价）")
+    @ApiModelProperty("评价状态（0：未评价，1：暂存，2：已评价）")
     private Integer evaluateStatus;
 
     /**