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/controller/wx/student/ExamPaperController.java | 50 +++++++++++++++++++++++---------------------------
1 files changed, 23 insertions(+), 27 deletions(-)
diff --git a/src/main/java/com/ycl/jxkg/controller/wx/student/ExamPaperController.java b/src/main/java/com/ycl/jxkg/controller/wx/student/ExamPaperController.java
index 9119047..fe2f885 100644
--- a/src/main/java/com/ycl/jxkg/controller/wx/student/ExamPaperController.java
+++ b/src/main/java/com/ycl/jxkg/controller/wx/student/ExamPaperController.java
@@ -1,24 +1,25 @@
package com.ycl.jxkg.controller.wx.student;
-import com.ycl.jxkg.base.RestResponse;
+import com.ycl.jxkg.base.Result;
import com.ycl.jxkg.controller.wx.BaseWXApiController;
-import com.ycl.jxkg.domain.ExamPaper;
-import com.ycl.jxkg.domain.Subject;
+import com.ycl.jxkg.domain.entity.ExamPaper;
+import com.ycl.jxkg.domain.entity.Subject;
import com.ycl.jxkg.service.ExamPaperService;
import com.ycl.jxkg.service.SubjectService;
-import com.ycl.jxkg.utility.DateTimeUtil;
-import com.ycl.jxkg.utility.PageInfoHelper;
-import com.ycl.jxkg.viewmodel.admin.exam.ExamPaperEditRequestVM;
-import com.ycl.jxkg.viewmodel.student.exam.ExamPaperPageResponseVM;
-import com.ycl.jxkg.viewmodel.student.exam.ExamPaperPageVM;
+import com.ycl.jxkg.utils.DateTimeUtil;
+import com.ycl.jxkg.utils.PageInfoHelper;
+import com.ycl.jxkg.domain.vo.admin.exam.ExamPaperEditRequestVO;
+import com.ycl.jxkg.domain.vo.student.exam.ExamPaperPageResponseVO;
+import com.ycl.jxkg.domain.vo.student.exam.ExamPaperPageVO;
import com.github.pagehelper.PageInfo;
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
-
+@RequiredArgsConstructor
@Controller("WXStudentExamController")
@RequestMapping(value = "/api/wx/student/exampaper")
@ResponseBody
@@ -27,31 +28,26 @@
private final ExamPaperService examPaperService;
private final SubjectService subjectService;
- @Autowired
- public ExamPaperController(ExamPaperService examPaperService, SubjectService subjectService) {
- this.examPaperService = examPaperService;
- this.subjectService = subjectService;
- }
-
@RequestMapping(value = "/select/{id}", method = RequestMethod.POST)
- public RestResponse<ExamPaperEditRequestVM> select(@PathVariable Integer id) {
- ExamPaperEditRequestVM vm = examPaperService.examPaperToVM(id);
- return RestResponse.ok(vm);
+ public Result<ExamPaperEditRequestVO> select(@PathVariable Integer id) {
+ ExamPaperEditRequestVO vm = examPaperService.examPaperToVM(id);
+ return Result.ok(vm);
}
@RequestMapping(value = "/pageList", method = RequestMethod.POST)
- public RestResponse<PageInfo<ExamPaperPageResponseVM>> pageList(@Valid ExamPaperPageVM model) {
+ public Result<PageInfo<ExamPaperPageResponseVO>> pageList(@Valid ExamPaperPageVO model) {
model.setLevelId(getCurrentUser().getUserLevel());
PageInfo<ExamPaper> pageInfo = examPaperService.studentPage(model);
- PageInfo<ExamPaperPageResponseVM> page = PageInfoHelper.copyMap(pageInfo, e -> {
- ExamPaperPageResponseVM vm = modelMapper.map(e, ExamPaperPageResponseVM.class);
- Subject subject = subjectService.selectById(vm.getSubjectId());
- vm.setSubjectName(subject.getName());
- vm.setCreateTime(DateTimeUtil.dateFormat(e.getCreateTime()));
- return vm;
+ PageInfo<ExamPaperPageResponseVO> page = PageInfoHelper.copyMap(pageInfo, e -> {
+ ExamPaperPageResponseVO vo = new ExamPaperPageResponseVO();
+ BeanUtils.copyProperties(e, vo);
+ Subject subject = subjectService.getById(vo.getSubjectId());
+ vo.setSubjectName(subject.getName());
+ vo.setCreateTime(DateTimeUtil.dateFormat(e.getCreateTime()));
+ return vo;
});
- return RestResponse.ok(page);
+ return Result.ok(page);
}
}
--
Gitblit v1.8.0