Merge remote-tracking branch 'origin/dev' into dev

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

@@ -269,6 +269,8 @@ public class EvaluateResultServiceImpl extends MPJBaseServiceImpl<EvaluateResult
                 .selectAs(EvaluateSubmitRecord::getEvaluateExecuterId, MobileResultPageVo::getEvaluateUserId)
                 .selectAs(EvaluateSubmitRecord::getStatus, MobileResultPageVo::getEvaluateStatus)
                 .selectAs(EvaluateSubmitRecord::getEvaluatedObject, MobileResultPageVo::getEvaluateType)
+                .selectAs(EvaluateManage::getIsAutoCreate, MobileResultPageVo::getIsAutoCreate)
+                .leftJoin(EvaluateManage.class, EvaluateManage::getId, EvaluateSubmitRecord::getEvaluateManageId)
                 .eq(EvaluateSubmitRecord::getId, dto.getEvaluateSubmitRecordId());
         MobileResultPageVo mobileResultPageVo = evaluateSubmitRecordMapper.selectJoinOne(MobileResultPageVo.class, evaluateSubmitRecordMPJLambdaWrapper);
 
@@ -294,17 +296,19 @@ public class EvaluateResultServiceImpl extends MPJBaseServiceImpl<EvaluateResult
             evaluateResultMapper.insert(evaluateResult);
         }
 
-        //修改答题人状态
-        evaluateExecuterMapper.updateById(new EvaluateExecuter(){{
-            setId(Long.parseLong(mobileResultPageVo.getEvaluateUserId()));
-            setStatus(1);
-        }});
-
-        //修改提交记录状态
-        evaluateSubmitRecordMapper.updateById(new EvaluateSubmitRecord(){{
-            setId(mobileResultPageVo.getEvaluateSubmitRecordId());
-            setStatus(1);
-        }});
+        if(mobileResultPageVo.getIsAutoCreate() != null && mobileResultPageVo.getIsAutoCreate() != 1){
+            //修改答题人状态
+            evaluateExecuterMapper.updateById(new EvaluateExecuter(){{
+                setId(Long.parseLong(mobileResultPageVo.getEvaluateUserId()));
+                setStatus(1);
+            }});
+
+            //修改提交记录状态
+            evaluateSubmitRecordMapper.updateById(new EvaluateSubmitRecord(){{
+                setId(mobileResultPageVo.getEvaluateSubmitRecordId());
+                setStatus(1);
+            }});
+        }
 
         return "ok";
     }

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

@@ -87,4 +87,10 @@ public class MobileResultPageVo {
 
     @ApiModelProperty("评价状态（0：未评价，1：已评价）")
     private Integer evaluateStatus;
+
+    /**
+     * 是否自动生成（0:否，1:是）
+     */
+    @ApiModelProperty("是否自动生成（0:否，1:是）")
+    private Integer isAutoCreate;
 }

src/main/java/com/xjrsoft/module/liteflow/node/StudentAssessmentInspectionNode.java

@@ -9,7 +9,7 @@ import org.springframework.stereotype.Component;
 import java.util.Map;
 
 /**
- * 新闻审核成功后发送消息
+ * 考核管理流程规则引擎
  */
 @Component("student_assessment_inspection_node")
 public class StudentAssessmentInspectionNode extends NodeComponent {

src/test/java/com/xjrsoft/module/student/service/impl/BaseStudentAssessmentInspectionServiceImplTest.java

@@ -0,0 +1,19 @@
+package com.xjrsoft.module.student.service.impl;
+
+import com.xjrsoft.module.room.service.IWfRoomApplicantService;
+import com.xjrsoft.module.student.service.IBaseStudentAssessmentInspectionService;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+
+import static org.junit.jupiter.api.Assertions.*;
+@SpringBootTest
+class BaseStudentAssessmentInspectionServiceImplTest {
+    @Autowired
+    private IBaseStudentAssessmentInspectionService baseStudentAssessmentInspectionService;
+
+    @Test
+    void dataHandle() {
+        baseStudentAssessmentInspectionService.dataHandle(1754388879206518784L);
+    }
+}