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 | 6 +
src/main/resources/mapper/ExamTemplatesMapper.xml | 6 +-
src/main/java/com/mindskip/xzs/controller/admin/ExamPaperController.java | 2
src/main/java/com/mindskip/xzs/service/impl/ExamTemplatesServiceImpl.java | 5 -
src/main/resources/mapper/ExamPaperDepartment.xml | 4 +
src/main/java/com/mindskip/xzs/domain/vo/ExamTemplatesVO.java | 4 +
src/main/java/com/mindskip/xzs/repository/ExamPaperDepartmentMapper.java | 7 ++
src/main/java/com/mindskip/xzs/domain/ExamTemplates.java | 2
src/main/java/com/mindskip/xzs/viewmodel/admin/exam/ExamPaperEditRequestVM.java | 2
src/main/java/com/mindskip/xzs/viewmodel/admin/exam/ExamResponseVM.java | 76 +------------------------
src/main/java/com/mindskip/xzs/service/ExamPaperDepartmentService.java | 7 ++
src/main/java/com/mindskip/xzs/service/impl/ExamPaperDepartmentServiceImpl.java | 5 +
12 files changed, 42 insertions(+), 84 deletions(-)
diff --git a/src/main/java/com/mindskip/xzs/controller/admin/ExamPaperController.java b/src/main/java/com/mindskip/xzs/controller/admin/ExamPaperController.java
index 5f472af..17bff2c 100644
--- a/src/main/java/com/mindskip/xzs/controller/admin/ExamPaperController.java
+++ b/src/main/java/com/mindskip/xzs/controller/admin/ExamPaperController.java
@@ -17,7 +17,6 @@
import com.mindskip.xzs.utility.excel.ExcelUtils;
import com.mindskip.xzs.viewmodel.admin.exam.*;
import lombok.SneakyThrows;
-import org.apache.commons.lang3.ObjectUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -58,6 +57,7 @@
vm.setCreateTime(DateTimeUtil.dateFormat(e.getCreateTime()));
vm.setSubjectId(examPaperSubjectService.getByExamPaperId(vm.getId())
.stream().map(ExamPaperSubject::getSubjectId).toArray(Integer[]::new));
+ vm.setCreateDepartment(examPaperDepartmentService.selectByUserId(vm.getCreateUser()));
return vm;
});
return RestResponse.ok(page);
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 55a7e14..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,8 +7,8 @@
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;
@@ -28,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();
}
@@ -52,6 +53,7 @@
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);
diff --git a/src/main/java/com/mindskip/xzs/domain/ExamTemplates.java b/src/main/java/com/mindskip/xzs/domain/ExamTemplates.java
index bacf938..d70a6b8 100644
--- a/src/main/java/com/mindskip/xzs/domain/ExamTemplates.java
+++ b/src/main/java/com/mindskip/xzs/domain/ExamTemplates.java
@@ -3,7 +3,6 @@
import lombok.Data;
import java.io.Serializable;
-import java.time.LocalDateTime;
import java.util.Date;
import java.util.List;
@@ -22,5 +21,6 @@
private Date startTime;
private Date endTime;
private Integer deptId;
+ private Integer createUser;
}
diff --git a/src/main/java/com/mindskip/xzs/domain/vo/ExamTemplatesVO.java b/src/main/java/com/mindskip/xzs/domain/vo/ExamTemplatesVO.java
index af34bd1..f6708ed 100644
--- a/src/main/java/com/mindskip/xzs/domain/vo/ExamTemplatesVO.java
+++ b/src/main/java/com/mindskip/xzs/domain/vo/ExamTemplatesVO.java
@@ -37,4 +37,8 @@
private List<Integer> paperIds;
+ private String createDepartment;
+
+ private Integer createUser;
+
}
diff --git a/src/main/java/com/mindskip/xzs/repository/ExamPaperDepartmentMapper.java b/src/main/java/com/mindskip/xzs/repository/ExamPaperDepartmentMapper.java
index be85b63..c741646 100644
--- a/src/main/java/com/mindskip/xzs/repository/ExamPaperDepartmentMapper.java
+++ b/src/main/java/com/mindskip/xzs/repository/ExamPaperDepartmentMapper.java
@@ -38,4 +38,11 @@
Integer removeByExamPaperId(Integer id);
Integer removeByExamPaperIds(@Param("ids") Integer[] ids);
+
+ /**
+ * 鏍规嵁鐢ㄦ埛id鑾峰彇閮ㄩ棬鍚嶇О
+ * @param userId 鐢ㄦ埛
+ * @return 鎵�鍦ㄩ儴闂�
+ */
+ String selectByUserId(Integer userId);
}
diff --git a/src/main/java/com/mindskip/xzs/service/ExamPaperDepartmentService.java b/src/main/java/com/mindskip/xzs/service/ExamPaperDepartmentService.java
index ec31ee8..f3958ac 100644
--- a/src/main/java/com/mindskip/xzs/service/ExamPaperDepartmentService.java
+++ b/src/main/java/com/mindskip/xzs/service/ExamPaperDepartmentService.java
@@ -35,4 +35,11 @@
Integer removeByExamPaperId(Integer id);
Integer removeByExamPaperIds(Integer[] ids);
+
+ /**
+ * 鏍规嵁鐢ㄦ埛id鑾峰彇閮ㄩ棬鍚嶇О
+ * @param userId 鐢ㄦ埛
+ * @return 鎵�鍦ㄩ儴闂�
+ */
+ String selectByUserId(Integer userId);
}
diff --git a/src/main/java/com/mindskip/xzs/service/impl/ExamPaperDepartmentServiceImpl.java b/src/main/java/com/mindskip/xzs/service/impl/ExamPaperDepartmentServiceImpl.java
index 3fe8c20..66d4a4b 100644
--- a/src/main/java/com/mindskip/xzs/service/impl/ExamPaperDepartmentServiceImpl.java
+++ b/src/main/java/com/mindskip/xzs/service/impl/ExamPaperDepartmentServiceImpl.java
@@ -42,4 +42,9 @@
public Integer removeByExamPaperIds(Integer[] ids) {
return examPaperDepartmentMapper.removeByExamPaperIds(ids);
}
+
+ @Override
+ public String selectByUserId(Integer userId) {
+ return examPaperDepartmentMapper.selectByUserId(userId);
+ }
}
diff --git a/src/main/java/com/mindskip/xzs/service/impl/ExamTemplatesServiceImpl.java b/src/main/java/com/mindskip/xzs/service/impl/ExamTemplatesServiceImpl.java
index 1c2a337..c0f8753 100644
--- a/src/main/java/com/mindskip/xzs/service/impl/ExamTemplatesServiceImpl.java
+++ b/src/main/java/com/mindskip/xzs/service/impl/ExamTemplatesServiceImpl.java
@@ -15,15 +15,11 @@
import com.mindskip.xzs.viewmodel.admin.exam.ExamPaperTitleItemVM;
import com.mindskip.xzs.viewmodel.admin.exam.QuestionTypeVM;
import lombok.extern.slf4j.Slf4j;
-import org.springframework.format.annotation.DateTimeFormat;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
-import java.text.ParseException;
import java.text.SimpleDateFormat;
-import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
@@ -77,6 +73,7 @@
examTemplates.setTitleName(model.getTitleItems().get(0).getName());
examTemplates.setStatus(model.getStatus());
examTemplates.setMenuIds(model.getMenuIds());
+ examTemplates.setCreateUser(model.getCreateUser());
examTemplatesMapper.add(examTemplates);
List<ExamTemplatesQuestion> examTemplatesQuestions = ExamTemplatesClassConvert.INSTANCE.QuestionTypeVMListToExamTemplatesQuestionList(model.getQuestionTypeVMS())
diff --git a/src/main/java/com/mindskip/xzs/viewmodel/admin/exam/ExamPaperEditRequestVM.java b/src/main/java/com/mindskip/xzs/viewmodel/admin/exam/ExamPaperEditRequestVM.java
index 67fc687..9926355 100644
--- a/src/main/java/com/mindskip/xzs/viewmodel/admin/exam/ExamPaperEditRequestVM.java
+++ b/src/main/java/com/mindskip/xzs/viewmodel/admin/exam/ExamPaperEditRequestVM.java
@@ -7,7 +7,6 @@
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.Size;
-import java.util.Arrays;
import java.util.List;
import java.util.Map;
@@ -55,5 +54,6 @@
private String status;
private String menuIds;
private Integer examPaperId;
+ private Integer createUser;
}
diff --git a/src/main/java/com/mindskip/xzs/viewmodel/admin/exam/ExamResponseVM.java b/src/main/java/com/mindskip/xzs/viewmodel/admin/exam/ExamResponseVM.java
index 902c58f..555e18b 100644
--- a/src/main/java/com/mindskip/xzs/viewmodel/admin/exam/ExamResponseVM.java
+++ b/src/main/java/com/mindskip/xzs/viewmodel/admin/exam/ExamResponseVM.java
@@ -1,8 +1,9 @@
package com.mindskip.xzs.viewmodel.admin.exam;
+import lombok.Data;
-
+@Data
public class ExamResponseVM {
private Integer id;
@@ -16,81 +17,12 @@
private Integer createUser;
+ private String createDepartment;
+
private Integer[] subjectId;
private Integer paperType;
private Integer frameTextContentId;
- public Integer getId() {
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public Integer getQuestionCount() {
- return questionCount;
- }
-
- public void setQuestionCount(Integer questionCount) {
- this.questionCount = questionCount;
- }
-
- public Integer getScore() {
- return score;
- }
-
- public void setScore(Integer score) {
- this.score = score;
- }
-
- public String getCreateTime() {
- return createTime;
- }
-
- public void setCreateTime(String createTime) {
- this.createTime = createTime;
- }
-
- public Integer getCreateUser() {
- return createUser;
- }
-
- public void setCreateUser(Integer createUser) {
- this.createUser = createUser;
- }
-
- public Integer[] getSubjectId() {
- return subjectId;
- }
-
- public void setSubjectId(Integer[] subjectId) {
- this.subjectId = subjectId;
- }
-
- public Integer getPaperType() {
- return paperType;
- }
-
- public void setPaperType(Integer paperType) {
- this.paperType = paperType;
- }
-
- public Integer getFrameTextContentId() {
- return frameTextContentId;
- }
-
- public void setFrameTextContentId(Integer frameTextContentId) {
- this.frameTextContentId = frameTextContentId;
- }
}
diff --git a/src/main/resources/mapper/ExamPaperDepartment.xml b/src/main/resources/mapper/ExamPaperDepartment.xml
index 0dc96e9..58dca25 100644
--- a/src/main/resources/mapper/ExamPaperDepartment.xml
+++ b/src/main/resources/mapper/ExamPaperDepartment.xml
@@ -35,6 +35,10 @@
where exam_paper_id = #{id} and deleted = 0
</select>
+ <select id="selectByUserId" resultType="java.lang.String">
+ SELECT b.name FROM t_user_department a INNER JOIN t_department b ON a.department_id = b.id WHERE a.user_id = #{userId}
+ </select>
+
<delete id="removeByExamPaperId" parameterType="java.lang.Integer">
delete from t_exam_paper_department
where exam_paper_id = #{id}
diff --git a/src/main/resources/mapper/ExamTemplatesMapper.xml b/src/main/resources/mapper/ExamTemplatesMapper.xml
index edeaf7c..f9c4436 100644
--- a/src/main/resources/mapper/ExamTemplatesMapper.xml
+++ b/src/main/resources/mapper/ExamTemplatesMapper.xml
@@ -20,8 +20,8 @@
</sql>
<insert id="add" parameterType="com.mindskip.xzs.domain.ExamTemplates" useGeneratedKeys="true" keyProperty="id">
- insert into t_exam_templates (name, paper_type, dept_id, suggest_time, title_name, ctime, status, menu_ids,start_time,end_time)
- values (#{name}, #{paperType}, #{deptId}, #{suggestTime}, #{titleName}, #{ctime}, #{status}, #{menuIds},#{startTime},#{endTime})
+ insert into t_exam_templates (name, paper_type, dept_id, suggest_time, title_name, ctime, status, menu_ids,start_time,end_time,create_user)
+ values (#{name}, #{paperType}, #{deptId}, #{suggestTime}, #{titleName}, #{ctime}, #{status}, #{menuIds},#{startTime},#{endTime}, #{createUser})
</insert>
<select id="getTime" resultMap="BaseResultMap">
@@ -57,7 +57,7 @@
<select id="getByadmins" resultMap="BaseResultMap" parameterType="com.mindskip.xzs.domain.vo.ExamTemplatesVO">
select
DISTINCT e.id
- , e.name, e.paper_type, e.suggest_time, e.title_name, e.ctime, e.status, e.menu_ids,e.start_time,e.end_time
+ , e.name, e.paper_type, e.suggest_time, e.title_name, e.ctime, e.status, e.menu_ids,e.start_time,e.end_time, e.create_user
from t_exam_templates e
left join t_exam_templates_user u on e.id = u.templates_id
<where>
--
Gitblit v1.8.0