Merge remote-tracking branch 'origin/master'

xiangpei

2024-05-17 f4f84ef25ce94e59dfe57961fcbb3c81f738ebb8

 src/main/java/com/mindskip/xzs/controller/admin/ExamPaperController.java

@@ -6,6 +6,7 @@
import com.mindskip.xzs.domain.ExamPaper;
import com.mindskip.xzs.domain.ExamPaperSubject;
import com.mindskip.xzs.domain.vo.PaperExcelVO;
import com.mindskip.xzs.domain.vo.UserVO;
import com.mindskip.xzs.service.ExamPaperDepartmentService;
import com.mindskip.xzs.service.ExamPaperService;
import com.mindskip.xzs.service.ExamPaperSubjectService;
@@ -24,8 +25,9 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import java.util.Objects;

@RestController("AdminExamPaperController")
@RequestMapping(value = "/api/admin/exam/paper")
@@ -46,6 +48,10 @@

    @RequestMapping(value = "/page", method = RequestMethod.POST)
    public RestResponse<PageInfo<ExamResponseVM>> pageList(@RequestBody ExamPaperPageRequestVM model) {
        model.setDeptIds(isDeptAdmin() ? getAdminDeptIds() : null);
        if (Objects.nonNull(model.getLevel())) {
            model.setDeptIds(Collections.singletonList(model.getLevel()));
        }
        model.setType("0");
        PageInfo<ExamPaper> pageInfo = examPaperService.page(model);
        PageInfo<ExamResponseVM> page = PageInfoHelper.copyMap(pageInfo, e -> {
@@ -78,12 +84,12 @@

    @RequestMapping(value = "/edit", method = RequestMethod.POST)
    public RestResponse<ExamPaperEditRequestVO> edit(@RequestBody @Valid ExamPaperEditRequestVM model) throws Exception {
        Object[] obj = Arrays.stream(model.getUserIds()).sorted().distinct().toArray();
        Integer[] userIds = new Integer[obj.length];
        for(int i = 0;i<obj.length;i++) {
            userIds[i] = (Integer)obj[i];
        }
        model.setUserIds(userIds);
        // Object[] obj = Arrays.stream(model.getUserIds()).sorted().distinct().toArray();
        // Integer[] userIds = new Integer[obj.length];
        // for(int i = 0;i<obj.length;i++) {
        //     userIds[i] = (Integer)obj[i];
        // }
        // model.setUserIds(userIds);
        ExamPaper examPaper = examPaperService.savePaperFromVM(model, getCurrentUser());
        ExamPaperEditRequestVO newVM = examPaperService.examPaperToVM(examPaper.getId());

@@ -126,6 +132,12 @@

    @RequestMapping(value = "/list", method = RequestMethod.GET)
    public RestResponse<List<ExamPaper>> list() {
        return RestResponse.ok(examPaperService.list());
        List<Integer> deptIds = isDeptAdmin() ? getAdminDeptIds() : null;
        return RestResponse.ok(examPaperService.list(deptIds));
    }

    @RequestMapping(value = "/selectStudent", method = RequestMethod.POST)
    public RestResponse<PageInfo<UserVO>> selectStudent(@RequestBody UserVO userVO) {
        return RestResponse.ok(examPaperService.selectStudent(userVO));
    }
}