|
@@ -11,6 +11,7 @@ import com.miaxis.common.utils.poi.ExcelUtil;
|
|
|
import com.miaxis.question.domain.QuestionCollection;
|
|
|
import com.miaxis.question.dto.QuestionCollectionDTO;
|
|
|
import com.miaxis.question.service.IQuestionCollectionService;
|
|
|
+import com.miaxis.score.domain.ScoreInfo;
|
|
|
import io.swagger.annotations.*;
|
|
|
import org.springframework.beans.BeanUtils;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
@@ -43,8 +44,10 @@ public class QuestionCollectionController extends BaseController{
|
|
|
@ApiImplicitParam(name = "pageNum",value = "当前页码" ,dataType = "int", paramType = "query", required = false),
|
|
|
@ApiImplicitParam(name = "pageSize",value = "每页数据量" , dataType = "int", paramType = "query", required = false),
|
|
|
})
|
|
|
- public ResponsePageInfo<QuestionCollection> list(@ModelAttribute QuestionCollection questionCollection){
|
|
|
+ public ResponsePageInfo<QuestionCollection> list(){
|
|
|
startPage();
|
|
|
+ QuestionCollection questionCollection = new QuestionCollection();
|
|
|
+ questionCollection.setUserId(SecurityUtils.getLoginUser().getStudent().getId());
|
|
|
List<QuestionCollection> list = questionCollectionService.selectQuestionCollectionList(questionCollection);
|
|
|
return toResponsePageInfo(list);
|
|
|
}
|
|
@@ -109,7 +112,10 @@ public class QuestionCollectionController extends BaseController{
|
|
|
@Log(title = "collection", businessType = BusinessTypeEnum.UPDATE)
|
|
|
@PutMapping
|
|
|
@ApiOperation("修改collection")
|
|
|
- public Response<Integer> edit(@RequestBody QuestionCollection questionCollection){
|
|
|
+ public Response<Integer> edit(@RequestBody QuestionCollectionDTO questionCollectionDTO){
|
|
|
+ QuestionCollection questionCollection = new QuestionCollection();
|
|
|
+ BeanUtils.copyProperties(questionCollectionDTO,questionCollection);
|
|
|
+ questionCollection.setUserId(SecurityUtils.getLoginUser().getStudent().getId());
|
|
|
return toResponse(questionCollectionService.updateById(questionCollection) ? 1 : 0);
|
|
|
}
|
|
|
|