考试安排

zhongzheng-admin/src/main/java/com/zhongzheng/controller/exam/ExamArrangementController.java

@@ -46,7 +46,7 @@ public class ExamArrangementController extends BaseController {
     /**
      * 查询考试安排，包含考试指引列表
      */
-    @ApiOperation("查询考试安排，包含考试指引列表")
+    @ApiOperation("考试指引列表")
     @PreAuthorize("@ss.hasPermi('modules.exam:arrangement:list')")
     @GetMapping("/list")
     public TableDataInfo<ExamArrangementVo> list(ExamArrangementQueryBo bo) {

zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/bo/ExamArrangementAddBo.java

@@ -85,8 +85,8 @@ public class ExamArrangementAddBo {
     @ApiModelProperty("分数线查询")
     private String scoreLineUrl;
     /** 申领证书 */
-    @ApiModelProperty("申领证书")
-    private String certificate;
+    @ApiModelProperty("申领证书时间")
+    private Integer certificate;
 
     /** 考試時間 */
     @ApiModelProperty("申领证书")

zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/bo/ExamArrangementQueryBo.java

@@ -114,4 +114,9 @@ public class ExamArrangementQueryBo extends BaseEntity {
 	@ApiModelProperty("考试结束时间")
 	private Long endTime;
 
+	/** 真实姓名 */
+	@ApiModelProperty("真实姓名")
+	private String realname;
+
+
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/bo/ExamArrangementSubAddBo.java

@@ -0,0 +1,21 @@
+package com.zhongzheng.modules.exam.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import java.util.Date;
+
+
+
+/**
+ * 【请填写功能名称】添加对象 exam_arrangement_sub
+ *
+ * @author ruoyi
+ * @date 2021-06-08
+ */
+@Data
+@ApiModel("【请填写功能名称】添加对象")
+public class ExamArrangementSubAddBo {
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/bo/ExamArrangementSubEditBo.java

@@ -0,0 +1,28 @@
+package com.zhongzheng.modules.exam.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import java.util.Date;
+
+
+/**
+ * 【请填写功能名称】编辑对象 exam_arrangement_sub
+ *
+ * @author ruoyi
+ * @date 2021-06-08
+ */
+@Data
+@ApiModel("【请填写功能名称】编辑对象")
+public class ExamArrangementSubEditBo {
+
+
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long examId;
+
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long subId;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/bo/ExamArrangementSubQueryBo.java

@@ -0,0 +1,40 @@
+package com.zhongzheng.modules.exam.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+import java.util.Map;
+import java.util.HashMap;
+
+import com.zhongzheng.common.core.domain.BaseEntity;
+
+/**
+ * 【请填写功能名称】分页查询对象 exam_arrangement_sub
+ *
+ * @author ruoyi
+ * @date 2021-06-08
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel("【请填写功能名称】分页查询对象")
+public class ExamArrangementSubQueryBo extends BaseEntity {
+
+	/** 分页大小 */
+	@ApiModelProperty("分页大小")
+	private Integer pageSize;
+	/** 当前页数 */
+	@ApiModelProperty("当前页数")
+	private Integer pageNum;
+	/** 排序列 */
+	@ApiModelProperty("排序列")
+	private String orderByColumn;
+	/** 排序的方向desc或者asc */
+	@ApiModelProperty(value = "排序的方向", example = "asc,desc")
+	private String isAsc;
+
+
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/service/IExamArrangementTimeService.java

@@ -6,6 +6,7 @@ import com.zhongzheng.modules.exam.bo.ExamArrangementTimeQueryBo;
 import com.zhongzheng.modules.exam.bo.ExamArrangementTimeAddBo;
 import com.zhongzheng.modules.exam.bo.ExamArrangementTimeEditBo;
 import com.baomidou.mybatisplus.extension.service.IService;
+import io.swagger.models.auth.In;
 
 import java.util.Collection;
 import java.util.List;
@@ -51,4 +52,6 @@ public interface IExamArrangementTimeService extends IService<ExamArrangementTim
 	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
 
     void insertExamArrangementTime(ExamArrangementTime examArrangementTime);
+
+    void inserTime(List<ExamArrangementTime> entity2Time, Long id);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/service/impl/ExamArrangementServiceImpl.java

@@ -3,6 +3,7 @@ package com.zhongzheng.modules.exam.service.impl;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.lang.func.VoidFunc0;
 import cn.hutool.core.util.StrUtil;
+import com.zhongzheng.common.utils.DateUtils;
 import com.zhongzheng.modules.exam.bo.ExamArrangementTimeAddBo;
 import com.zhongzheng.modules.exam.domain.ExamArrangementTime;
 import com.zhongzheng.modules.exam.service.IExamArrangementStudentService;
@@ -52,6 +53,7 @@ public class ExamArrangementServiceImpl extends ServiceImpl<ExamArrangementMappe
     @Autowired
     private IExamArrangementStudentService examArrangementStudentService;
 
+
     @Override
     public ExamArrangementVo queryById(Long id){
         ExamArrangement db = this.baseMapper.selectById(id);
@@ -142,8 +144,10 @@ public class ExamArrangementServiceImpl extends ServiceImpl<ExamArrangementMappe
     public Boolean insertByAddBo(ExamArrangementAddBo bo) {
         ExamArrangement add = BeanUtil.toBean(bo, ExamArrangement.class);
         validEntityBeforeSave(add);
-        examArrangementTimeService.saveBatch(entity2Time(bo.getExamArrangementTimeAddBo()));
-        return this.save(add);
+        add.setCreateTime(DateUtils.getNowTime());
+        boolean save = this.save(add);
+        examArrangementTimeService.inserTime(entity2Time(bo.getExamArrangementTimeAddBo()),add.getId());
+        return save;
     }
 
     /**

zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/service/impl/ExamArrangementTimeServiceImpl.java

@@ -1,7 +1,9 @@
 package com.zhongzheng.modules.exam.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.convert.Convert;
 import cn.hutool.core.util.StrUtil;
+import com.github.pagehelper.Constant;
 import com.zhongzheng.common.utils.DateUtils;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -99,4 +101,9 @@ public class ExamArrangementTimeServiceImpl extends ServiceImpl<ExamArrangementT
     public void insertExamArrangementTime(ExamArrangementTime examArrangementTime) {
         baseMapper.insertExamTime(examArrangementTime);
     }
+
+    @Override
+    public void inserTime(List<ExamArrangementTime> entity2Time,Long id) {
+        entity2Time.stream().forEach(a -> baseMapper.insertExamTime(a.setArrangementId(id)));
+    }
 }