From a6a3bb04cdaa334a2868d09b20518ed98575bccb Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期二, 02 七月 2024 18:08:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/mindskip/xzs/controller/admin/ExamTemplatesController.java | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/mindskip/xzs/controller/admin/ExamTemplatesController.java b/src/main/java/com/mindskip/xzs/controller/admin/ExamTemplatesController.java
index 161d99d..026dfc8 100644
--- a/src/main/java/com/mindskip/xzs/controller/admin/ExamTemplatesController.java
+++ b/src/main/java/com/mindskip/xzs/controller/admin/ExamTemplatesController.java
@@ -7,15 +7,18 @@
import com.mindskip.xzs.domain.ExamTemplates;
import com.mindskip.xzs.domain.ExamTemplatesSubject;
import com.mindskip.xzs.domain.vo.ExamTemplatesVO;
-import com.mindskip.xzs.repository.DepartmentMapper;
import com.mindskip.xzs.repository.ExamTemplatesSubjectMapper;
+import com.mindskip.xzs.service.ExamPaperDepartmentService;
import com.mindskip.xzs.service.ExamTemplatesService;
import com.mindskip.xzs.utility.PageInfoHelper;
import com.mindskip.xzs.viewmodel.admin.exam.ExamPaperEditRequestVM;
import lombok.RequiredArgsConstructor;
+import org.apache.commons.lang3.ObjectUtils;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
+import java.util.List;
+import java.util.stream.Collectors;
@RestController("AdminExamTemplatesController")
@RequestMapping(value = "/api/admin/exam/templates")
@@ -25,10 +28,11 @@
private final ExamTemplatesService examTemplatesService;
private final ExamTemplatesSubjectMapper examTemplatesSubjectMapper;
private final WebContext webContext;
- private final DepartmentMapper departmentMapper;
+ private final ExamPaperDepartmentService examPaperDepartmentService;
@RequestMapping(value = "/edit", method = RequestMethod.POST)
public RestResponse edit(@RequestBody @Valid ExamPaperEditRequestVM model) {
+ model.setCreateUser(getCurrentUser().getId());
examTemplatesService.add(model);
return RestResponse.ok();
}
@@ -36,15 +40,20 @@
@RequestMapping(value = "/list", method = RequestMethod.GET)
public RestResponse<PageInfo<ExamTemplatesVO>> list(ExamTemplatesVO examTemplatesVO) throws Exception {
// 濡傛灉鏄儴闂ㄧ鐞嗗憳锛岄渶瑕佸仛鏁版嵁鏉冮檺
- examTemplatesVO.setDeptId(isDeptAdmin() ? getAdminDeptIds() : null);
+ examTemplatesVO.setDeptId(ObjectUtils.isNotEmpty(examTemplatesVO.getDeptId()) ? examTemplatesVO.getDeptId() : getAdminDeptIds());
PageInfo<ExamTemplates> pageInfo = examTemplatesService.getByadmins(examTemplatesVO);
PageInfo<ExamTemplatesVO> info = PageInfoHelper.copyMap(pageInfo, e -> {
ExamTemplatesVO vo = new ExamTemplatesVO();
vo.setName(e.getName());
vo.setId(e.getId());
vo.setCtime(e.getCtime());
- Integer[] ids = examTemplatesSubjectMapper.getTemplatesId(e.getId()).stream().map(ExamTemplatesSubject::getSubjectId).toArray(Integer[]::new);
+
+ List<ExamTemplatesSubject> subjectList = examTemplatesSubjectMapper.getTemplatesId(e.getId());
+ Integer[] ids = subjectList.stream().map(ExamTemplatesSubject::getSubjectId).toArray(Integer[]::new);
+ String subjectNames = subjectList.stream().map(ExamTemplatesSubject::getSubjectName).collect(Collectors.joining("銆�"));
+ vo.setSubjectNames(subjectNames);
vo.setSubjectId(ids);
+ vo.setCreateDepartment(examPaperDepartmentService.selectByUserId(e.getCreateUser()));
return vo;
});
return RestResponse.ok(info);
--
Gitblit v1.8.0