From b7273d6fc94ae5e14f5a911d8b8b88cb7c848264 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期三, 30 十月 2024 20:14:10 +0800
Subject: [PATCH] 学员bug
---
src/main/java/com/ycl/jxkg/service/impl/TaskExamCustomerAnswerImpl.java | 82 ++++++++++++++++++----------------------
1 files changed, 37 insertions(+), 45 deletions(-)
diff --git a/src/main/java/com/ycl/jxkg/service/impl/TaskExamCustomerAnswerImpl.java b/src/main/java/com/ycl/jxkg/service/impl/TaskExamCustomerAnswerImpl.java
index e2b2a2c..9983648 100644
--- a/src/main/java/com/ycl/jxkg/service/impl/TaskExamCustomerAnswerImpl.java
+++ b/src/main/java/com/ycl/jxkg/service/impl/TaskExamCustomerAnswerImpl.java
@@ -1,64 +1,56 @@
package com.ycl.jxkg.service.impl;
-import com.ycl.jxkg.domain.ExamPaper;
-import com.ycl.jxkg.domain.ExamPaperAnswer;
-import com.ycl.jxkg.domain.TaskExamCustomerAnswer;
-import com.ycl.jxkg.domain.TextContent;
-import com.ycl.jxkg.domain.task.TaskItemAnswerObject;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ycl.jxkg.domain.entity.ExamPaper;
+import com.ycl.jxkg.domain.entity.ExamPaperScore;
+import com.ycl.jxkg.domain.entity.TaskExamCustomerAnswer;
import com.ycl.jxkg.mapper.TaskExamCustomerAnswerMapper;
import com.ycl.jxkg.service.TaskExamCustomerAnswerService;
import com.ycl.jxkg.service.TextContentService;
-import com.ycl.jxkg.utils.JsonUtil;
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
-import java.util.Arrays;
import java.util.Date;
import java.util.List;
@Service
-public class TaskExamCustomerAnswerImpl extends BaseServiceImpl<TaskExamCustomerAnswer> implements TaskExamCustomerAnswerService {
+@RequiredArgsConstructor
+public class TaskExamCustomerAnswerImpl extends ServiceImpl<TaskExamCustomerAnswerMapper, TaskExamCustomerAnswer> implements TaskExamCustomerAnswerService {
private final TaskExamCustomerAnswerMapper taskExamCustomerAnswerMapper;
private final TextContentService textContentService;
- @Autowired
- public TaskExamCustomerAnswerImpl(TaskExamCustomerAnswerMapper taskExamCustomerAnswerMapper, TextContentService textContentService) {
- super(taskExamCustomerAnswerMapper);
- this.taskExamCustomerAnswerMapper = taskExamCustomerAnswerMapper;
- this.textContentService = textContentService;
- }
-
@Override
- public void insertOrUpdate(ExamPaper examPaper, ExamPaperAnswer examPaperAnswer, Date now) {
- Integer taskId = examPaper.getTaskExamId();
- Integer userId = examPaperAnswer.getCreateUser();
- TaskExamCustomerAnswer taskExamCustomerAnswer = taskExamCustomerAnswerMapper.getByTUid(taskId, userId);
- if (null == taskExamCustomerAnswer) {
- taskExamCustomerAnswer = new TaskExamCustomerAnswer();
- taskExamCustomerAnswer.setCreateTime(now);
- taskExamCustomerAnswer.setCreateUser(userId);
- taskExamCustomerAnswer.setTaskExamId(taskId);
- TaskItemAnswerObject taskItemAnswerObject = new TaskItemAnswerObject();
- taskItemAnswerObject.setExamPaperId(examPaperAnswer.getExamPaperId());
- taskItemAnswerObject.setExamPaperAnswerId(examPaperAnswer.getId());
- taskItemAnswerObject.setStatus(examPaperAnswer.getStatus());
- List<TaskItemAnswerObject> taskItemAnswerObjects = Arrays.asList(taskItemAnswerObject);
- TextContent textContent = textContentService.jsonConvertInsert(taskItemAnswerObjects, now, null);
- textContentService.insertByFilter(textContent);
- taskExamCustomerAnswer.setTextContentId(textContent.getId());
- insertByFilter(taskExamCustomerAnswer);
- } else {
- TextContent textContent = textContentService.selectById(taskExamCustomerAnswer.getTextContentId());
- List<TaskItemAnswerObject> taskItemAnswerObjects = JsonUtil.toJsonListObject(textContent.getContent(), TaskItemAnswerObject.class);
- TaskItemAnswerObject taskItemAnswerObject = new TaskItemAnswerObject();
- taskItemAnswerObject.setExamPaperId(examPaperAnswer.getExamPaperId());
- taskItemAnswerObject.setExamPaperAnswerId(examPaperAnswer.getId());
- taskItemAnswerObject.setStatus(examPaperAnswer.getStatus());
- taskItemAnswerObjects.add(taskItemAnswerObject);
- textContentService.jsonConvertUpdate(textContent, taskItemAnswerObjects, null);
- textContentService.updateByIdFilter(textContent);
- }
+ public void insertOrUpdate(ExamPaper examPaper, ExamPaperScore examPaperScore, Date now) {
+ //TODO:寰呭畬鎴�
+// Integer taskId = examPaper.getTaskExamId();
+// Integer userId = examPaperAnswer.getCreateUser();
+// TaskExamCustomerAnswer taskExamCustomerAnswer = taskExamCustomerAnswerMapper.getByTUid(taskId, userId);
+// if (null == taskExamCustomerAnswer) {
+// taskExamCustomerAnswer = new TaskExamCustomerAnswer();
+// taskExamCustomerAnswer.setCreateTime(now);
+// taskExamCustomerAnswer.setCreateUser(userId);
+// taskExamCustomerAnswer.setTaskExamId(taskId);
+// TaskItemAnswerObject taskItemAnswerObject = new TaskItemAnswerObject();
+// taskItemAnswerObject.setExamPaperId(examPaperAnswer.getExamPaperId());
+// taskItemAnswerObject.setExamPaperAnswerId(examPaperAnswer.getId());
+// taskItemAnswerObject.setStatus(examPaperAnswer.getStatus());
+// List<TaskItemAnswerObject> taskItemAnswerObjects = Arrays.asList(taskItemAnswerObject);
+// TextContent textContent = textContentService.jsonConvertInsert(taskItemAnswerObjects, now, null);
+// textContentService.save(textContent);
+// taskExamCustomerAnswer.setTextContentId(textContent.getId());
+// baseMapper.insert(taskExamCustomerAnswer);
+// } else {
+// TextContent textContent = textContentService.getById(taskExamCustomerAnswer.getTextContentId());
+// List<TaskItemAnswerObject> taskItemAnswerObjects = JsonUtil.toJsonListObject(textContent.getContent(), TaskItemAnswerObject.class);
+// TaskItemAnswerObject taskItemAnswerObject = new TaskItemAnswerObject();
+// taskItemAnswerObject.setExamPaperId(examPaperAnswer.getExamPaperId());
+// taskItemAnswerObject.setExamPaperAnswerId(examPaperAnswer.getId());
+// taskItemAnswerObject.setStatus(examPaperAnswer.getStatus());
+// taskItemAnswerObjects.add(taskItemAnswerObject);
+// textContentService.jsonConvertUpdate(textContent, taskItemAnswerObjects, null);
+// textContentService.updateById(textContent);
+// }
}
@Override
--
Gitblit v1.8.0