From 8546b3d285af4235a0ef615a0c6e89486ae2c806 Mon Sep 17 00:00:00 2001 From: fuliqi <fuliqi@qq.com> Date: 星期四, 17 十月 2024 21:01:37 +0800 Subject: [PATCH] 达梦不支持value改为values --- src/main/java/com/ycl/jxkg/service/impl/TaskExamCustomerAnswerImpl.java | 70 ++++++++++++++++------------------ 1 files changed, 33 insertions(+), 37 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 ce7f58d..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,20 +1,15 @@ package com.ycl.jxkg.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -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.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 lombok.RequiredArgsConstructor; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.Arrays; import java.util.Date; import java.util.List; @@ -26,35 +21,36 @@ private final 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.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); - } + 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