From 607b15cde6515d18de64a40e17c5aef7fcf24bcb Mon Sep 17 00:00:00 2001
From: 龚焕茏 <2842157468@qq.com>
Date: 星期三, 12 六月 2024 17:51:30 +0800
Subject: [PATCH] fix：成绩管理
---
src/main/java/com/ycl/jxkg/service/impl/ExamTemplateServiceImpl.java | 184 +++++++++++++++++++++++++++++++++++++++-------
1 files changed, 156 insertions(+), 28 deletions(-)
diff --git a/src/main/java/com/ycl/jxkg/service/impl/ExamTemplateServiceImpl.java b/src/main/java/com/ycl/jxkg/service/impl/ExamTemplateServiceImpl.java
index 5ebc5cb..695db7e 100644
--- a/src/main/java/com/ycl/jxkg/service/impl/ExamTemplateServiceImpl.java
+++ b/src/main/java/com/ycl/jxkg/service/impl/ExamTemplateServiceImpl.java
@@ -1,33 +1,51 @@
package com.ycl.jxkg.service.impl;
import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.Assert;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.github.pagehelper.PageInfo;
-import com.ycl.jxkg.base.Result;
+import com.ycl.jxkg.context.WebContext;
import com.ycl.jxkg.domain.entity.ExamTemplate;
-import com.ycl.jxkg.domain.form.ExamTemplateForm;
-import com.ycl.jxkg.domain.query.ExamTemplateQuery;
-import com.ycl.jxkg.domain.vo.admin.exam.ExamTemplateVO;
+import com.ycl.jxkg.domain.entity.User;
+import com.ycl.jxkg.domain.question.TemplateQuestionDTO;
+import com.ycl.jxkg.enums.QuestionTypeEnum;
+import com.ycl.jxkg.enums.VisibilityEnum;
import com.ycl.jxkg.mapper.ExamTemplateMapper;
import com.ycl.jxkg.service.ExamTemplateService;
-import com.ycl.jxkg.utils.PageUtil;
-import lombok.RequiredArgsConstructor;
-import org.springframework.beans.BeanUtils;
+import com.ycl.jxkg.base.Result;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ycl.jxkg.domain.form.ExamTemplateForm;
+import com.ycl.jxkg.domain.vo.ExamTemplateVO;
+import com.ycl.jxkg.domain.query.ExamTemplateQuery;
+import io.swagger.models.auth.In;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.core.context.SecurityContext;
+import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.security.core.userdetails.UserDetails;
import org.springframework.stereotype.Service;
+import lombok.RequiredArgsConstructor;
+import com.ycl.jxkg.utils.PageUtil;
+import org.springframework.beans.BeanUtils;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.Assert;
+import org.springframework.util.StringUtils;
+import java.math.BigDecimal;
+import java.security.Security;
+import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;
/**
* 闅忔満璇曞嵎妯℃澘 鏈嶅姟瀹炵幇绫�
*
- * @author 寮�鍙戜汉鍛樺悕瀛�
- * @since 2024-06-03
+ * @author flq
+ * @since 2024-06-05
*/
@Service
@RequiredArgsConstructor
public class ExamTemplateServiceImpl extends ServiceImpl<ExamTemplateMapper, ExamTemplate> implements ExamTemplateService {
+
+ @Autowired
+ protected WebContext webContext;
private final ExamTemplateMapper examTemplateMapper;
@@ -38,8 +56,54 @@
*/
@Override
public Result add(ExamTemplateForm form) {
- ExamTemplate entity = ExamTemplateForm.getEntityByForm(form, null);
- baseMapper.insert(entity);
+// ExamTemplate entity = ExamTemplateForm.getEntityByForm(form, null);
+// User currentUser = webContext.getCurrentUser();
+// entity.setCreateUser(currentUser.getId());
+// entity.setCreateTime(new Date());
+// if(!StringUtils.isEmpty(entity.getVisibility())) {
+// entity.setVisibility(VisibilityEnum.fromCode(entity.getVisibility()).getName());
+// }
+// List<TemplateQuestionDTO> questionList = form.getQuestionList();
+// BigDecimal score = BigDecimal.ZERO;
+// //璁剧疆棰樼洰淇℃伅
+// for (TemplateQuestionDTO dto : questionList) {
+// score = score.add(dto.getScore().multiply(BigDecimal.valueOf(dto.getNum())));
+// Integer questionType = dto.getQuestionType();
+// switch (QuestionTypeEnum.fromCode(questionType)){
+// //鍗曢��
+// case SingleChoice:
+// entity.setSingleChoice(dto.getNum());
+// entity.setSingleScore(dto.getScore());
+// break;
+// //澶氶��
+// case MultipleChoice:
+// entity.setMultipleChoice(dto.getNum());
+// entity.setMultipleScore(dto.getScore());
+// break;
+// //鍒ゆ柇
+// case TrueFalse:
+// entity.setTrueFalse(dto.getNum());
+// entity.setTrueFalseScore(dto.getScore());
+// break;
+// //濉┖
+// case GapFilling:
+// entity.setGapFilling(dto.getNum());
+// entity.setGapScore(dto.getScore());
+// break;
+// //绠�绛�
+// case ShortAnswer:
+// entity.setShortAnswer(dto.getNum());
+// entity.setShortAnswerScore(dto.getScore());
+// break;
+// //璁＄畻
+// case Calculation:
+// entity.setCalculation(dto.getNum());
+// entity.setCalculationScore(dto.getScore());
+// break;
+// }
+// }
+// entity.setScore(score);
+// baseMapper.insert(entity);
return Result.ok("娣诲姞鎴愬姛");
}
@@ -49,14 +113,55 @@
* @return
*/
@Override
+ @Transactional(rollbackFor = Exception.class)
public Result update(ExamTemplateForm form) {
- ExamTemplate entity = baseMapper.selectById(form.getId());
-
- // 涓虹┖鎶汭llegalArgumentException锛屽仛鍏ㄥ眬寮傚父澶勭悊
- Assert.notNull(entity, "璁板綍涓嶅瓨鍦�");
- BeanUtils.copyProperties(form, entity);
- baseMapper.updateById(entity);
- return Result.ok("淇敼鎴愬姛");
+// ExamTemplate entity = ExamTemplateForm.getEntityByForm(form, null);
+// if(!StringUtils.isEmpty(entity.getVisibility())) {
+// entity.setVisibility(VisibilityEnum.fromCode(entity.getVisibility()).getName());
+// }
+// List<TemplateQuestionDTO> questionList = form.getQuestionList();
+// BigDecimal score = BigDecimal.ZERO;
+// //璁剧疆棰樼洰淇℃伅
+// for (TemplateQuestionDTO dto : questionList) {
+// score = score.add(dto.getScore().multiply(BigDecimal.valueOf(dto.getNum())));
+// Integer questionType = dto.getQuestionType();
+// switch (QuestionTypeEnum.fromCode(questionType)){
+// //鍗曢��
+// case SingleChoice:
+// entity.setSingleChoice(dto.getNum());
+// entity.setSingleScore(dto.getScore());
+// break;
+// //澶氶��
+// case MultipleChoice:
+// entity.setMultipleChoice(dto.getNum());
+// entity.setMultipleScore(dto.getScore());
+// break;
+// //鍒ゆ柇
+// case TrueFalse:
+// entity.setTrueFalse(dto.getNum());
+// entity.setTrueFalseScore(dto.getScore());
+// break;
+// //濉┖
+// case GapFilling:
+// entity.setGapFilling(dto.getNum());
+// entity.setGapScore(dto.getScore());
+// break;
+// //绠�绛�
+// case ShortAnswer:
+// entity.setShortAnswer(dto.getNum());
+// entity.setShortAnswerScore(dto.getScore());
+// break;
+// //璁＄畻
+// case Calculation:
+// entity.setCalculation(dto.getNum());
+// entity.setCalculationScore(dto.getScore());
+// break;
+// }
+// }
+// entity.setScore(score);
+// examTemplateMapper.removeById(entity.getId());
+// baseMapper.insert(entity);
+ return Result.ok("淇敼鎴愬姛");
}
/**
@@ -88,12 +193,35 @@
*/
@Override
public Result page(ExamTemplateQuery query) {
- IPage<ExamTemplateVO> page = PageUtil.getPage(query, ExamTemplateVO.class);
+ IPage<ExamTemplate> page = PageUtil.getPage(query, ExamTemplate.class);
baseMapper.getPage(page, query);
- PageInfo<ExamTemplateVO> pageInfo = new PageInfo<>();
- pageInfo.setList(page.getRecords());
- pageInfo.setTotal(page.getTotal());
- return Result.ok(pageInfo);
+ List<ExamTemplate> records = page.getRecords();
+ List<ExamTemplateVO> vos = new ArrayList<>();
+ for (ExamTemplate examTemplate : records) {
+// ExamTemplateVO vo = new ExamTemplateVO();
+// BeanUtils.copyProperties(examTemplate,vo);
+// String visibility = vo.getVisibility();
+// vo.setVisibility(VisibilityEnum.valueOf(visibility).getCode()+"");
+// //鏁寸悊棰樼洰淇℃伅涓洪泦鍚�
+// List<TemplateQuestionDTO> questionList = new ArrayList<>();
+// addQuestionList(questionList,QuestionTypeEnum.SingleChoice.getCode(),examTemplate.getSingleScore(),examTemplate.getSingleChoice());
+// addQuestionList(questionList,QuestionTypeEnum.MultipleChoice.getCode(),examTemplate.getMultipleScore(),examTemplate.getMultipleChoice());
+// addQuestionList(questionList,QuestionTypeEnum.TrueFalse.getCode(),examTemplate.getTrueFalseScore(),examTemplate.getTrueFalse());
+// addQuestionList(questionList,QuestionTypeEnum.GapFilling.getCode(),examTemplate.getGapScore(),examTemplate.getGapFilling());
+// addQuestionList(questionList,QuestionTypeEnum.ShortAnswer.getCode(),examTemplate.getShortAnswerScore(),examTemplate.getShortAnswer());
+// addQuestionList(questionList,QuestionTypeEnum.Calculation.getCode(),examTemplate.getCalculationScore(),examTemplate.getCalculation());
+// vo.setQuestionList(questionList);
+// vos.add(vo);
+ }
+ return Result.ok().data(vos).total(page.getTotal());
+ }
+
+ private void addQuestionList(List<TemplateQuestionDTO> questionList, Integer code,BigDecimal score,Integer num) {
+ TemplateQuestionDTO questionDTO = new TemplateQuestionDTO();
+ questionDTO.setQuestionType(code);
+ questionDTO.setScore(score);
+ questionDTO.setNum(num);
+ questionList.add(questionDTO);
}
/**
@@ -105,7 +233,7 @@
public Result detail(Integer id) {
ExamTemplateVO vo = baseMapper.getById(id);
Assert.notNull(vo, "璁板綍涓嶅瓨鍦�");
- return Result.ok(vo);
+ return Result.ok().data(vo);
}
/**
@@ -118,6 +246,6 @@
List<ExamTemplateVO> vos = entities.stream()
.map(entity -> ExamTemplateVO.getVoByEntity(entity, null))
.collect(Collectors.toList());
- return Result.ok(vos);
+ return Result.ok().data(vos);
}
}
--
Gitblit v1.8.0