paper
parent
65913418f7
commit
31830f86ad
|
|
@ -5,14 +5,14 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||||
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
||||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||||
|
import org.qinan.cedu.enums.DeleteEnum;
|
||||||
import org.qinan.cedu.enums.QuestionTypeEnum;
|
import org.qinan.cedu.enums.QuestionTypeEnum;
|
||||||
|
import org.qinan.cedu.mapper.QuestionMapper;
|
||||||
import org.qinan.cedu.model.dto.PaperQuestionPageQueryDTO;
|
import org.qinan.cedu.model.dto.PaperQuestionPageQueryDTO;
|
||||||
import org.qinan.cedu.model.dto.QuestionUpdateDTO;
|
import org.qinan.cedu.model.dto.QuestionUpdateDTO;
|
||||||
import org.qinan.cedu.model.entity.QuestionDO;
|
import org.qinan.cedu.model.entity.QuestionDO;
|
||||||
import org.qinan.cedu.model.entity.QuestionOptionDO;
|
import org.qinan.cedu.model.entity.QuestionOptionDO;
|
||||||
import org.qinan.cedu.model.vo.PaperQuestionVO;
|
import org.qinan.cedu.model.vo.PaperQuestionVO;
|
||||||
import org.qinan.cedu.enums.DeleteEnum;
|
|
||||||
import org.qinan.cedu.mapper.QuestionMapper;
|
|
||||||
import org.qinan.cedu.service.QuestionOptionService;
|
import org.qinan.cedu.service.QuestionOptionService;
|
||||||
import org.qinan.cedu.service.QuestionService;
|
import org.qinan.cedu.service.QuestionService;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
|
|
@ -146,7 +146,6 @@ public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, QuestionDO>
|
||||||
.eq(QuestionOptionDO::getDeleteEnum, DeleteEnum.FALSE.getCode())
|
.eq(QuestionOptionDO::getDeleteEnum, DeleteEnum.FALSE.getCode())
|
||||||
.orderByAsc(QuestionOptionDO::getSortOrder)
|
.orderByAsc(QuestionOptionDO::getSortOrder)
|
||||||
.list();
|
.list();
|
||||||
questionDO.setOptions(options);
|
|
||||||
return questionDO;
|
return questionDO;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue