bug

distributed-print-business/src/main/java/com/qmth/distributed/print/business/entity/ExamDetailCourse.java

@@ -59,6 +59,9 @@ public class ExamDetailCourse extends BaseEntity implements Serializable {
     @TableField("paper_type")
     private String paperType;
 
+    @TableField("clazz_id")
+    private String clazzId;
+
     @ApiModelProperty(value = "备用题卡json")
     @TableField("attachment_id")
     private String attachmentId;
@@ -154,4 +157,12 @@ public class ExamDetailCourse extends BaseEntity implements Serializable {
     public void setCardPagesA3(Integer cardPagesA3) {
         this.cardPagesA3 = cardPagesA3;
     }
+
+    public String getClazzId() {
+        return clazzId;
+    }
+
+    public void setClazzId(String clazzId) {
+        this.clazzId = clazzId;
+    }
 }

distributed-print-business/src/main/java/com/qmth/distributed/print/business/entity/ExamStudent.java

@@ -60,6 +60,9 @@ public class ExamStudent extends BaseEntity implements Serializable {
     @TableField("paper_type")
     private String paperType;
 
+    @TableField("clazz_id")
+    private String clazzId;
+
     @JsonSerialize(using = ToStringSerializer.class)
     @ApiModelProperty(value = "附件id")
     @TableField(value = "attachment_id")
@@ -168,6 +171,14 @@ public class ExamStudent extends BaseEntity implements Serializable {
         this.paperType = paperType;
     }
 
+    public String getClazzId() {
+        return clazzId;
+    }
+
+    public void setClazzId(String clazzId) {
+        this.clazzId = clazzId;
+    }
+
     public Boolean getSyncStatus() {
         return syncStatus;
     }

distributed-print-business/src/main/java/com/qmth/distributed/print/business/entity/ExamTask.java

@@ -109,6 +109,9 @@ public class ExamTask extends BaseEntity implements Serializable {
     @TableField("lecturer_name")
     private String lecturerName;
 
+    @TableField("paper_name")
+    private String paperName;
+
     @TableField(exist = false)
     private List<Map<String, String>> users;
 
@@ -273,6 +276,14 @@ public class ExamTask extends BaseEntity implements Serializable {
         this.lecturerName = lecturerName;
     }
 
+    public String getPaperName() {
+        return paperName;
+    }
+
+    public void setPaperName(String paperName) {
+        this.paperName = paperName;
+    }
+
     public List<Map<String, String>> getUsers() {
         return users;
     }

distributed-print-business/src/main/java/com/qmth/distributed/print/business/entity/ExamTaskApplyTemp.java

@@ -0,0 +1,69 @@
+package com.qmth.distributed.print.business.entity;
+
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.qmth.distributed.print.business.enums.ExamStatusEnum;
+import com.qmth.distributed.print.business.enums.ReviewStatusEnum;
+import com.qmth.teachcloud.common.base.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.io.Serializable;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 命题任务
+ * </p>
+ *
+ * @author xf
+ * @since 2021-03-23
+ */
+@TableName("exam_task_apply_temp")
+public class ExamTaskApplyTemp extends BaseEntity implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "学校id")
+    @JsonSerialize(using = ToStringSerializer.class)
+    @TableField("school_id")
+    private Long schoolId;
+
+    @ApiModelProperty(value = "机构id")
+    @JsonSerialize(using = ToStringSerializer.class)
+    @TableField(value = "org_id", updateStrategy = FieldStrategy.IGNORED)
+    private Long orgId;
+
+    /**
+     * 课程代码
+     */
+    @TableField("exam_task_content")
+    private String examTaskContent;
+
+    public Long getSchoolId() {
+        return schoolId;
+    }
+
+    public void setSchoolId(Long schoolId) {
+        this.schoolId = schoolId;
+    }
+
+    public Long getOrgId() {
+        return orgId;
+    }
+
+    public void setOrgId(Long orgId) {
+        this.orgId = orgId;
+    }
+
+    public String getExamTaskContent() {
+        return examTaskContent;
+    }
+
+    public void setExamTaskContent(String examTaskContent) {
+        this.examTaskContent = examTaskContent;
+    }
+}

distributed-print-business/src/main/java/com/qmth/distributed/print/business/mapper/ExamTaskApplyTempMapper.java

@@ -0,0 +1,24 @@
+package com.qmth.distributed.print.business.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.qmth.distributed.print.business.bean.dto.CardRuleDto;
+import com.qmth.distributed.print.business.entity.BasicCardRule;
+import com.qmth.distributed.print.business.entity.ExamTaskApplyTemp;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Set;
+
+/**
+ * <p>
+ * 命题任务创建临时表 Mapper 接口
+ * </p>
+ *
+ * @author xf
+ * @since 2021-09-06
+ */
+public interface ExamTaskApplyTempMapper extends BaseMapper<ExamTaskApplyTemp> {
+
+}

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/ExamTaskApplyTempService.java

@@ -0,0 +1,15 @@
+package com.qmth.distributed.print.business.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.qmth.distributed.print.business.entity.ExamTaskApplyTemp;
+
+/**
+ * <p>
+ * 命题任务 服务类
+ * </p>
+ *
+ * @author xf
+ * @since 2021-03-23
+ */
+public interface ExamTaskApplyTempService extends IService<ExamTaskApplyTemp> {
+}

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/ExamCardServiceImpl.java

@@ -20,6 +20,7 @@ import com.qmth.teachcloud.common.entity.BasicAttachment;
 import com.qmth.teachcloud.common.entity.SysUser;
 import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
 import com.qmth.teachcloud.common.service.BasicAttachmentService;
+import com.qmth.teachcloud.common.service.BasicCourseService;
 import com.qmth.teachcloud.common.service.TeachcloudCommonService;
 import com.qmth.teachcloud.common.util.ServletUtil;
 import org.apache.commons.lang3.StringUtils;
@@ -61,6 +62,9 @@ public class ExamCardServiceImpl extends ServiceImpl<ExamCardMapper, ExamCard> i
     @Resource
     TeachcloudCommonService teachcloudCommonService;
 
+    @Autowired
+    BasicCourseService basicCourseService;
+
     @Transactional
     @Override
     public String saveExamCard(ExamCardParams examCardParams) {
@@ -78,7 +82,7 @@ public class ExamCardServiceImpl extends ServiceImpl<ExamCardMapper, ExamCard> i
         if (examCardParams.getId() == null) {
             examCard = new ExamCard();
             examCard.setSchoolId(schoolId);
-            examCard.setOrgId(user.getOrgId());
+            examCard.setOrgId(basicCourseService.getOrgIdBySchoolIdAndCourseCode(schoolId, examCardParams.getCourseCode()));
             examCard.setCourseCode(examCardParams.getCourseCode());
             examCard.setCourseName(examCardParams.getCourseName());
             examCard.setTitle(examCardParams.getTitle());
@@ -87,7 +91,6 @@ public class ExamCardServiceImpl extends ServiceImpl<ExamCardMapper, ExamCard> i
             examCard.setType(examCardParams.getType());
             examCard.setTemplateId(examCardParams.getTemplateId());
             examCard.insertInfo(user.getId());
-            examCard.setOrgId(user.getOrgId());
             this.save(examCard);
 
             examCardDetail = new ExamCardDetail();

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/ExamTaskApplyTempServiceImpl.java

@@ -0,0 +1,14 @@
+package com.qmth.distributed.print.business.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.qmth.distributed.print.business.entity.ExamTaskApplyTemp;
+import com.qmth.distributed.print.business.mapper.ExamTaskApplyTempMapper;
+import com.qmth.distributed.print.business.service.ExamTaskApplyTempService;
+import org.springframework.stereotype.Service;
+
+/**
+ * @Date: 2021/9/6.
+ */
+@Service
+public class ExamTaskApplyTempServiceImpl extends ServiceImpl<ExamTaskApplyTempMapper, ExamTaskApplyTemp> implements ExamTaskApplyTempService {
+}

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/ExamTaskPrintServiceImpl.java

@@ -223,6 +223,7 @@ public class ExamTaskPrintServiceImpl extends ServiceImpl<ExamTaskPrintMapper, E
             examDetailCourse.setCourseCode(examTaskPrint.getCourseCode());
             examDetailCourse.setCourseName(examTaskPrint.getCourseName());
             examDetailCourse.setPaperNumber(examTaskPrint.getPaperNumber());
+            examDetailCourse.setClazzId(examTaskPrint.getClassId());
             examDetailCourse.setTotalSubjects(examTaskPrint.getStudentCount());
             examDetailCourse.setCreateId(examTaskPrint.getCreateId());
             examDetailCourseService.save(examDetailCourse);
@@ -267,6 +268,8 @@ public class ExamTaskPrintServiceImpl extends ServiceImpl<ExamTaskPrintMapper, E
             QueryWrapper<ExamDetailCourse> examDetailCourseQueryWrapper = new QueryWrapper<>();
             examDetailCourseQueryWrapper.lambda().eq(ExamDetailCourse::getExamDetailId, taskPrint.getExamDetailId());
             ExamDetailCourse examDetailCourse = examDetailCourseService.getOne(examDetailCourseQueryWrapper);
+            examDetailCourse.setClazzId(taskPrint.getClassId());
+            examDetailCourseService.updateById(examDetailCourse);
 
             UpdateWrapper<ExamStudent> examStudentUpdateWrapper = new UpdateWrapper<>();
             examStudentUpdateWrapper.lambda().eq(ExamStudent::getExamDetailCourseId, examDetailCourse.getId());
@@ -380,6 +383,7 @@ public class ExamTaskPrintServiceImpl extends ServiceImpl<ExamTaskPrintMapper, E
             examStudent.setTicketNumber(createTempNumber(ticketNumberParams));
             examStudent.setExtendFields(examTaskPrint.getExtendFields());
             examStudent.setSiteNumber(String.valueOf(atomicInteger.getAndIncrement()));
+            examStudent.setClazzId(String.valueOf(basicStudent.getClazzId()));
             examStudent.setCreateId(examTaskPrint.getCreateId());
             examStudents.add(examStudent);
         }

distributed-print-business/src/main/resources/mapper/ExamTaskApplyTempMapper.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.qmth.distributed.print.business.mapper.ExamTaskApplyTempMapper">
+</mapper>