代码整合

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/dto/CourseDimensionDto.java

@@ -1,47 +0,0 @@
-package com.qmth.distributed.print.business.bean.dto;
-
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import io.swagger.annotations.ApiModelProperty;
-
-/**
- * @Description: 毕业要求dto
- * @Author: CaoZixuan
- * @Date: 2024-02-28
- */
-public class CourseDimensionDto {
-
-    @ApiModelProperty("课程知识点id")
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long id;
-
-    @ApiModelProperty("课程知识点代码")
-    private String code;
-
-    @ApiModelProperty("课程知识点名称")
-    private String name;
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public String getCode() {
-        return code;
-    }
-
-    public void setCode(String code) {
-        this.code = code;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-}

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/dto/CourseDimensionImportDto.java

@@ -1,41 +0,0 @@
-package com.qmth.distributed.print.business.bean.dto;
-
-import com.qmth.boot.tools.excel.annotation.ExcelColumn;
-import com.qmth.teachcloud.common.annotation.ExcelNote;
-import io.swagger.annotations.ApiModelProperty;
-
-import javax.validation.constraints.NotNull;
-
-/**
- * @Description: 课程知识点数据导入dto
- * @Author: CaoZixuan
- * @Date: 2024-02-27
- */
-public class CourseDimensionImportDto {
-
-    @ApiModelProperty("一级知识点内容")
-    @ExcelColumn(name = "一级知识点内容", index = 0, nullable = true)
-    @NotNull
-    private String firstDimensionName;
-
-    @ApiModelProperty("二级知识点内容")
-    @ExcelColumn(name = "二级知识点内容", index = 1)
-    @NotNull
-    private String secondDimensionName;
-
-    public String getFirstDimensionName() {
-        return firstDimensionName;
-    }
-
-    public void setFirstDimensionName(String firstDimensionName) {
-        this.firstDimensionName = firstDimensionName;
-    }
-
-    public String getSecondDimensionName() {
-        return secondDimensionName;
-    }
-
-    public void setSecondDimensionName(String secondDimensionName) {
-        this.secondDimensionName = secondDimensionName;
-    }
-}

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/dto/CourseDimensionMd5Dto.java

@@ -1,70 +0,0 @@
-package com.qmth.distributed.print.business.bean.dto;
-
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.qmth.distributed.print.business.enums.CourseDimensionSourceEnum;
-import io.swagger.annotations.ApiModelProperty;
-
-/**
- * @Description: 知识点Md5比对dto
- * @Author: CaoZixuan
- * @Date: 2024-03-13
- */
-public class CourseDimensionMd5Dto {
-
-    @ApiModelProperty(value = "来源")
-    private CourseDimensionSourceEnum source;
-
-    @ApiModelProperty(value = "知识点编号")
-    private String code;
-
-    @ApiModelProperty(value = "知识点名称")
-    private String name;
-
-    @ApiModelProperty(value = "排序")
-    private Integer number;
-
-    @ApiModelProperty(value = "父id（顶级知识点父id为0）")
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long parentId;
-
-    public CourseDimensionSourceEnum getSource() {
-        return source;
-    }
-
-    public void setSource(CourseDimensionSourceEnum source) {
-        this.source = source;
-    }
-
-    public String getCode() {
-        return code;
-    }
-
-    public void setCode(String code) {
-        this.code = code;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public Integer getNumber() {
-        return number;
-    }
-
-    public void setNumber(Integer number) {
-        this.number = number;
-    }
-
-    public Long getParentId() {
-        return parentId;
-    }
-
-    public void setParentId(Long parentId) {
-        this.parentId = parentId;
-    }
-}

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/dto/CourseWeightDetailDto.java

@@ -1,107 +0,0 @@
-package com.qmth.distributed.print.business.bean.dto;
-
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.qmth.distributed.print.business.enums.CourseEvaluationTypeEnum;
-import com.qmth.teachcloud.common.contant.SystemConstant;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.math.BigDecimal;
-
-/**
- * @Description: 课程评价方式权重详情
- * @Author: CaoZixuan
- * @Date: 2024-03-01
- */
-public class CourseWeightDetailDto {
-
-    @ApiModelProperty("评价方式id")
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long evaluationId;
-
-    @ApiModelProperty("评价方式名称")
-    private String evaluationName;
-
-    @ApiModelProperty("评价方式描述")
-    private String evaluationDesc;
-
-    @ApiModelProperty("是否启用")
-    private Boolean enable;
-
-    @ApiModelProperty("权重")
-    private BigDecimal weight;
-
-    @ApiModelProperty("目标分值")
-    private BigDecimal targetScore;
-
-    @ApiModelProperty("评价方式类型")
-    private CourseEvaluationTypeEnum evaluationType;
-
-    public CourseWeightDetailDto() {
-
-    }
-
-    public CourseWeightDetailDto(String evaluationName, BigDecimal weight, BigDecimal targetScore) {
-        this.evaluationId = SystemConstant.getDbUuid();
-        this.evaluationName = evaluationName;
-        this.enable = true;
-        this.weight = weight;
-        this.targetScore = targetScore;
-    }
-
-    public Long getEvaluationId() {
-        return evaluationId;
-    }
-
-    public void setEvaluationId(Long evaluationId) {
-        this.evaluationId = evaluationId;
-    }
-
-    public String getEvaluationName() {
-        return evaluationName;
-    }
-
-    public void setEvaluationName(String evaluationName) {
-        this.evaluationName = evaluationName;
-    }
-
-    public Boolean getEnable() {
-        return enable;
-    }
-
-    public void setEnable(Boolean enable) {
-        this.enable = enable;
-    }
-
-    public BigDecimal getWeight() {
-        return weight;
-    }
-
-    public void setWeight(BigDecimal weight) {
-        this.weight = weight;
-    }
-
-    public BigDecimal getTargetScore() {
-        return targetScore;
-    }
-
-    public void setTargetScore(BigDecimal targetScore) {
-        this.targetScore = targetScore;
-    }
-
-    public String getEvaluationDesc() {
-        return evaluationDesc;
-    }
-
-    public void setEvaluationDesc(String evaluationDesc) {
-        this.evaluationDesc = evaluationDesc;
-    }
-
-    public CourseEvaluationTypeEnum getEvaluationType() {
-        return evaluationType;
-    }
-
-    public void setEvaluationType(CourseEvaluationTypeEnum evaluationType) {
-        this.evaluationType = evaluationType;
-    }
-}

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/dto/CourseWeightDto.java

@@ -1,124 +0,0 @@
-package com.qmth.distributed.print.business.bean.dto;
-
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.math.BigDecimal;
-import java.util.List;
-import java.util.stream.Collectors;
-
-/**
- * @Description: 课程权重dto
- * @Author: CaoZixuan
- * @Date: 2024-03-01
- */
-public class CourseWeightDto {
-
-    @ApiModelProperty("课程目标id")
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long courseTargetId;
-
-    @ApiModelProperty("课程目标名称")
-    private String courseTargetName;
-
-    @ApiModelProperty("毕业要求指标（评价依据）")
-    private List<CourseDimensionDto> dimensionList;
-
-    @ApiModelProperty("毕业要求指标（评价依据）解析字符串")
-    private String dimensionStr;
-
-    @ApiModelProperty("支撑毕业要求")
-    private String degreeRequirement;
-
-    @ApiModelProperty("目标整体权重")
-    private BigDecimal totalWeight;
-
-    @ApiModelProperty("目标分值统计")
-    private BigDecimal totalScore;
-
-    @ApiModelProperty("评价方式权重详情")
-    private List<CourseWeightDetailDto> evaluationList;
-
-    public CourseWeightDto() {
-
-    }
-
-    public CourseWeightDto(Long courseTargetId, String courseTargetName, String degreeRequirement, BigDecimal totalWeight, BigDecimal totalScore, List<CourseWeightDetailDto> evaluationList) {
-        this.courseTargetId = courseTargetId;
-        this.courseTargetName = courseTargetName;
-        this.degreeRequirement = degreeRequirement;
-        this.totalWeight = totalWeight;
-        this.totalScore = totalScore;
-        this.evaluationList = evaluationList;
-    }
-
-    public Long getCourseTargetId() {
-        return courseTargetId;
-    }
-
-    public void setCourseTargetId(Long courseTargetId) {
-        this.courseTargetId = courseTargetId;
-    }
-
-    public String getCourseTargetName() {
-        return courseTargetName;
-    }
-
-    public void setCourseTargetName(String courseTargetName) {
-        this.courseTargetName = courseTargetName;
-    }
-
-    public List<CourseDimensionDto> getDimensionList() {
-        return dimensionList;
-    }
-
-    public void setDimensionList(List<CourseDimensionDto> dimensionList) {
-        this.dimensionList = dimensionList;
-    }
-
-    public String getDimensionStr() {
-        return dimensionStr;
-    }
-
-    public void setDimensionStr(String dimensionStr) {
-        this.dimensionStr = dimensionStr;
-    }
-
-    public String getDegreeRequirement() {
-        return degreeRequirement;
-    }
-
-    public void setDegreeRequirement(String degreeRequirement) {
-        this.degreeRequirement = degreeRequirement;
-    }
-
-    public BigDecimal getTotalWeight() {
-        return totalWeight;
-    }
-
-    public void setTotalWeight(BigDecimal totalWeight) {
-        this.totalWeight = totalWeight;
-    }
-
-    public BigDecimal getTotalScore() {
-        return totalScore;
-    }
-
-    public void setTotalScore(BigDecimal totalScore) {
-        this.totalScore = totalScore;
-    }
-
-    public List<CourseWeightDetailDto> getEvaluationList() {
-        return evaluationList;
-    }
-
-    public void setEvaluationList(List<CourseWeightDetailDto> evaluationList) {
-        this.evaluationList = evaluationList;
-    }
-
-    // 解析指标集合
-    public void analyzeDimensionStr() {
-        dimensionStr = dimensionList.stream().map(e -> String.format("%s(%s)", e.getName(), e.getCode())).collect(Collectors.joining(","));
-    }
-}

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/dto/CourseWeightFormDto.java

@@ -1,117 +0,0 @@
-package com.qmth.distributed.print.business.bean.dto;
-
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.qmth.distributed.print.business.enums.CourseEvaluationTypeEnum;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.math.BigDecimal;
-
-/**
- * @Description: 课程权重表单dto（展开的结构）
- * @Author: CaoZixuan
- * @Date: 2024-03-06
- */
-public class CourseWeightFormDto {
-
-    @ApiModelProperty("课程目标id")
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long targetId;
-
-    @ApiModelProperty("课程目标名称")
-    private String targetName;
-
-    @ApiModelProperty("目标创建时间")
-    private Long targetCreateTime;
-
-    @ApiModelProperty("对应课程目标分值")
-    private BigDecimal targetScore;
-
-    @ApiModelProperty("评价方式id")
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long evaluationId;
-
-    @ApiModelProperty("评价方式（项目）")
-    private String evaluation;
-
-    @ApiModelProperty("评价方式内容（考核内容及其要求）")
-    private String evaluationDesc;
-
-    @ApiModelProperty("评价方式创建时间")
-    private Long evaluationCreateTime;
-
-    @ApiModelProperty("评价方式类型（默认/自定义）")
-    private CourseEvaluationTypeEnum type;
-
-    public Long getTargetId() {
-        return targetId;
-    }
-
-    public void setTargetId(Long targetId) {
-        this.targetId = targetId;
-    }
-
-    public String getTargetName() {
-        return targetName;
-    }
-
-    public void setTargetName(String targetName) {
-        this.targetName = targetName;
-    }
-
-    public Long getTargetCreateTime() {
-        return targetCreateTime;
-    }
-
-    public void setTargetCreateTime(Long targetCreateTime) {
-        this.targetCreateTime = targetCreateTime;
-    }
-
-    public BigDecimal getTargetScore() {
-        return targetScore;
-    }
-
-    public void setTargetScore(BigDecimal targetScore) {
-        this.targetScore = targetScore;
-    }
-
-    public Long getEvaluationId() {
-        return evaluationId;
-    }
-
-    public void setEvaluationId(Long evaluationId) {
-        this.evaluationId = evaluationId;
-    }
-
-    public String getEvaluation() {
-        return evaluation;
-    }
-
-    public void setEvaluation(String evaluation) {
-        this.evaluation = evaluation;
-    }
-
-    public String getEvaluationDesc() {
-        return evaluationDesc;
-    }
-
-    public void setEvaluationDesc(String evaluationDesc) {
-        this.evaluationDesc = evaluationDesc;
-    }
-
-    public Long getEvaluationCreateTime() {
-        return evaluationCreateTime;
-    }
-
-    public void setEvaluationCreateTime(Long evaluationCreateTime) {
-        this.evaluationCreateTime = evaluationCreateTime;
-    }
-
-    public CourseEvaluationTypeEnum getType() {
-        return type;
-    }
-
-    public void setType(CourseEvaluationTypeEnum type) {
-        this.type = type;
-    }
-}

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/dto/professional/MatrixDto.java

@@ -1,46 +0,0 @@
-package com.qmth.distributed.print.business.bean.dto.professional;
-
-import com.qmth.distributed.print.business.entity.TPProfessional;
-
-import java.util.List;
-
-public class MatrixDto extends TPProfessional {
-
-    private String courseCode;
-    private String courseName;
-    // 是否可编辑
-    private Boolean canEdit;
-    private List<MatrixRequirementDto> requirements;
-
-    public String getCourseCode() {
-        return courseCode;
-    }
-
-    public void setCourseCode(String courseCode) {
-        this.courseCode = courseCode;
-    }
-
-    public String getCourseName() {
-        return courseName;
-    }
-
-    public void setCourseName(String courseName) {
-        this.courseName = courseName;
-    }
-
-    public List<MatrixRequirementDto> getRequirements() {
-        return requirements;
-    }
-
-    public void setRequirements(List<MatrixRequirementDto> requirements) {
-        this.requirements = requirements;
-    }
-
-    public Boolean getCanEdit() {
-        return canEdit;
-    }
-
-    public void setCanEdit(Boolean canEdit) {
-        this.canEdit = canEdit;
-    }
-}

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/dto/professional/MatrixRequirementDto.java

@@ -1,29 +0,0 @@
-package com.qmth.distributed.print.business.bean.dto.professional;
-
-import com.qmth.distributed.print.business.entity.TPProfessional;
-
-import java.util.List;
-
-public class MatrixRequirementDto extends TPProfessional {
-
-    private String name;
-    private List<MatrixSubRequirementDto> subRequirements;
-
-    @Override
-    public String getName() {
-        return name;
-    }
-
-    @Override
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public List<MatrixSubRequirementDto> getSubRequirements() {
-        return subRequirements;
-    }
-
-    public void setSubRequirements(List<MatrixSubRequirementDto> subRequirements) {
-        this.subRequirements = subRequirements;
-    }
-}

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/dto/professional/MatrixSubRequirementDto.java

@@ -1,41 +0,0 @@
-package com.qmth.distributed.print.business.bean.dto.professional;
-
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.qmth.distributed.print.business.entity.TPProfessional;
-
-public class MatrixSubRequirementDto extends TPProfessional {
-
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long id;
-    private String name;
-    private Double content;
-
-    @Override
-    public Long getId() {
-        return id;
-    }
-
-    @Override
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    @Override
-    public String getName() {
-        return name;
-    }
-
-    @Override
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public Double getContent() {
-        return content;
-    }
-
-    public void setContent(Double content) {
-        this.content = content;
-    }
-}

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/dto/professional/ProfessionalDto.java

@@ -1,34 +0,0 @@
-package com.qmth.distributed.print.business.bean.dto.professional;
-
-import com.qmth.distributed.print.business.entity.TPProfessional;
-
-public class ProfessionalDto extends TPProfessional {
-
-    private String orgName;
-    private String loginName;
-    private String userName;
-
-    public String getOrgName() {
-        return orgName;
-    }
-
-    public void setOrgName(String orgName) {
-        this.orgName = orgName;
-    }
-
-    public String getLoginName() {
-        return loginName;
-    }
-
-    public void setLoginName(String loginName) {
-        this.loginName = loginName;
-    }
-
-    public String getUserName() {
-        return userName;
-    }
-
-    public void setUserName(String userName) {
-        this.userName = userName;
-    }
-}

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/dto/report/CourseTargetWebDto.java

@@ -1,180 +0,0 @@
-package com.qmth.distributed.print.business.bean.dto.report;
-
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.qmth.distributed.print.business.bean.dto.CourseWeightDto;
-import io.swagger.annotations.ApiModelProperty;
-import org.jetbrains.annotations.NotNull;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.List;
-
-/**
- * @Description: 课程目标dto
- * @Param:
- * @return:
- * @Author: wangliang
- * @Date: 2024/2/26
- */
-@JsonInclude(JsonInclude.Include.NON_NULL)
-public class CourseTargetWebDto implements Serializable, Comparable<CourseTargetWebDto> {
-
-    @JsonSerialize(using = ToStringSerializer.class)
-    @ApiModelProperty(value = "课程目标id")
-    private Long targetId;
-
-    @ApiModelProperty(value = "课程目标名称")
-    private String targetName;
-
-    @ApiModelProperty(value = "毕业要求")
-    private String graduationRequirement;
-
-    @ApiModelProperty(value = "毕业要求指标点")
-    private String graduationRequirementPoint;
-
-    @ApiModelProperty(value = "目标整体权重")
-    private BigDecimal targetSumWeight;
-
-    @ApiModelProperty(value = "目标整体分值")
-    private BigDecimal targetSumScore;
-
-    @ApiModelProperty(value = "知识点集合")
-    private List<DimensionDto> dimensionList;
-
-    @ApiModelProperty(value = "目标达成评价值")
-    private BigDecimal evaluationValue;
-
-    @ApiModelProperty(value = "评价方式集合")
-    private List<ReportEvaluationDto> evaluationList;
-
-    @ApiModelProperty(value = "知识点卷面总分")
-    private Double dimensionScoreSum = 0.0d;
-
-    @ApiModelProperty(value = "知识点集合")
-    private String dimensionPoint;
-
-    @ApiModelProperty(value = "小题卷面总分")
-    private Double finalScoreQuestionScoreSum = 0.0d;
-
-    public CourseTargetWebDto() {
-
-    }
-
-    public CourseTargetWebDto(CourseWeightDto courseWeightDto) {
-        this.targetId = courseWeightDto.getCourseTargetId();
-        this.targetName = courseWeightDto.getCourseTargetName();
-        this.graduationRequirement = courseWeightDto.getDegreeRequirement();
-        this.graduationRequirementPoint = courseWeightDto.getDimensionStr();
-        this.targetSumWeight = courseWeightDto.getTotalWeight();
-        this.targetSumScore = courseWeightDto.getTotalScore();
-    }
-
-    public Double getFinalScoreQuestionScoreSum() {
-        return finalScoreQuestionScoreSum;
-    }
-
-    public void setFinalScoreQuestionScoreSum(Double finalScoreQuestionScoreSum) {
-        this.finalScoreQuestionScoreSum = finalScoreQuestionScoreSum;
-    }
-
-    public String getDimensionPoint() {
-        return dimensionPoint;
-    }
-
-    public void setDimensionPoint(String dimensionPoint) {
-        this.dimensionPoint = dimensionPoint;
-    }
-
-    public Double getDimensionScoreSum() {
-        return dimensionScoreSum;
-    }
-
-    public void setDimensionScoreSum(Double dimensionScoreSum) {
-        this.dimensionScoreSum = dimensionScoreSum;
-    }
-
-    public String getGraduationRequirementPoint() {
-        return graduationRequirementPoint;
-    }
-
-    public void setGraduationRequirementPoint(String graduationRequirementPoint) {
-        this.graduationRequirementPoint = graduationRequirementPoint;
-    }
-
-    public BigDecimal getTargetSumWeight() {
-        return targetSumWeight;
-    }
-
-    public void setTargetSumWeight(BigDecimal targetSumWeight) {
-        this.targetSumWeight = targetSumWeight;
-    }
-
-    public BigDecimal getTargetSumScore() {
-        return targetSumScore;
-    }
-
-    public void setTargetSumScore(BigDecimal targetSumScore) {
-        this.targetSumScore = targetSumScore;
-    }
-
-    public BigDecimal getEvaluationValue() {
-        return evaluationValue;
-    }
-
-    public void setEvaluationValue(BigDecimal evaluationValue) {
-        this.evaluationValue = evaluationValue;
-    }
-
-    public List<ReportEvaluationDto> getEvaluationList() {
-        return evaluationList;
-    }
-
-    public void setEvaluationList(List<ReportEvaluationDto> evaluationList) {
-        this.evaluationList = evaluationList;
-    }
-
-    public List<DimensionDto> getDimensionList() {
-        return dimensionList;
-    }
-
-    public void setDimensionList(List<DimensionDto> dimensionList) {
-        this.dimensionList = dimensionList;
-    }
-
-    public Long getTargetId() {
-        return targetId;
-    }
-
-    public void setTargetId(Long targetId) {
-        this.targetId = targetId;
-    }
-
-    public String getTargetName() {
-        return targetName;
-    }
-
-    public void setTargetName(String targetName) {
-        this.targetName = targetName;
-    }
-
-    public String getGraduationRequirement() {
-        return graduationRequirement;
-    }
-
-    public void setGraduationRequirement(String graduationRequirement) {
-        this.graduationRequirement = graduationRequirement;
-    }
-
-    @Override
-    public int compareTo(@NotNull CourseTargetWebDto o) {
-        if (o.getTargetId().longValue() < this.getTargetId().longValue()) {
-            return 1;
-        } else if (o.getTargetId().longValue() > this.getTargetId().longValue()) {
-            return -1;
-        } else {
-            return 0;
-        }
-    }
-}

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/dto/report/CourseTargetWordDto.java

@@ -1,190 +0,0 @@
-package com.qmth.distributed.print.business.bean.dto.report;
-
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.qmth.distributed.print.business.bean.dto.CourseWeightDto;
-import io.swagger.annotations.ApiModelProperty;
-import org.jetbrains.annotations.NotNull;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-
-/**
- * @Description: 课程目标word dto
- * @Param:
- * @return:
- * @Author: wangliang
- * @Date: 2024/2/26
- */
-@JsonInclude(JsonInclude.Include.NON_NULL)
-public class CourseTargetWordDto implements Serializable, Comparable<CourseTargetWordDto> {
-
-    @JsonSerialize(using = ToStringSerializer.class)
-    @ApiModelProperty(value = "课程目标id")
-    private Long targetId;
-
-    @ApiModelProperty(value = "课程目标名称")
-    private String targetName;
-
-    @ApiModelProperty(value = "毕业要求")
-    private String graduationRequirement;
-
-    @ApiModelProperty(value = "毕业要求指标点")
-    private String graduationRequirementPoint;
-
-    @ApiModelProperty(value = "目标整体权重")
-    private BigDecimal targetSumWeight = new BigDecimal(0);
-
-    @ApiModelProperty(value = "目标整体分值")
-    private BigDecimal targetSumScore = new BigDecimal(0);
-
-    @ApiModelProperty(value = "换算平均分")
-    private Double matrixAvgScore = 0.0d;
-
-    @ApiModelProperty(value = "目标达成评价值")
-    private BigDecimal evaluationValue = new BigDecimal(0);
-
-    @ApiModelProperty(value = "平时成绩信息")
-    private UsualScoreWordDto usualScoreDto;
-
-    @ApiModelProperty(value = "期末成绩信息")
-    private FinalScoreWordDto finalScoreDto;
-
-    @ApiModelProperty(value = "知识点卷面总分")
-    private Double dimensionScoreSum = 0.0d;
-
-    @ApiModelProperty(value = "知识点集合")
-    private String dimensionPoint;
-
-    @ApiModelProperty(value = "期末成绩小题卷面总分")
-    private Double finalScoreQuestionScoreSum = 0.0d;
-
-    public CourseTargetWordDto() {
-
-    }
-
-    public CourseTargetWordDto(CourseWeightDto courseWeightDto) {
-        this.targetId = courseWeightDto.getCourseTargetId();
-        this.targetName = courseWeightDto.getCourseTargetName();
-        this.graduationRequirement = courseWeightDto.getDegreeRequirement();
-        this.graduationRequirementPoint = courseWeightDto.getDimensionStr();
-        this.targetSumScore = courseWeightDto.getTotalScore();
-        this.targetSumWeight = courseWeightDto.getTotalWeight();
-    }
-
-    public Double getFinalScoreQuestionScoreSum() {
-        return finalScoreQuestionScoreSum;
-    }
-
-    public void setFinalScoreQuestionScoreSum(Double finalScoreQuestionScoreSum) {
-        this.finalScoreQuestionScoreSum = finalScoreQuestionScoreSum;
-    }
-
-    public String getDimensionPoint() {
-        return dimensionPoint;
-    }
-
-    public void setDimensionPoint(String dimensionPoint) {
-        this.dimensionPoint = dimensionPoint;
-    }
-
-    public Double getDimensionScoreSum() {
-        return dimensionScoreSum;
-    }
-
-    public void setDimensionScoreSum(Double dimensionScoreSum) {
-        this.dimensionScoreSum = dimensionScoreSum;
-    }
-
-    public BigDecimal getEvaluationValue() {
-        return evaluationValue;
-    }
-
-    public void setEvaluationValue(BigDecimal evaluationValue) {
-        this.evaluationValue = evaluationValue;
-    }
-
-    public String getGraduationRequirement() {
-        return graduationRequirement;
-    }
-
-    public void setGraduationRequirement(String graduationRequirement) {
-        this.graduationRequirement = graduationRequirement;
-    }
-
-    public String getGraduationRequirementPoint() {
-        return graduationRequirementPoint;
-    }
-
-    public void setGraduationRequirementPoint(String graduationRequirementPoint) {
-        this.graduationRequirementPoint = graduationRequirementPoint;
-    }
-
-    public BigDecimal getTargetSumWeight() {
-        return targetSumWeight;
-    }
-
-    public void setTargetSumWeight(BigDecimal targetSumWeight) {
-        this.targetSumWeight = targetSumWeight;
-    }
-
-    public BigDecimal getTargetSumScore() {
-        return targetSumScore;
-    }
-
-    public void setTargetSumScore(BigDecimal targetSumScore) {
-        this.targetSumScore = targetSumScore;
-    }
-
-    public Long getTargetId() {
-        return targetId;
-    }
-
-    public void setTargetId(Long targetId) {
-        this.targetId = targetId;
-    }
-
-    public String getTargetName() {
-        return targetName;
-    }
-
-    public void setTargetName(String targetName) {
-        this.targetName = targetName;
-    }
-
-    public UsualScoreWordDto getUsualScoreDto() {
-        return usualScoreDto;
-    }
-
-    public void setUsualScoreDto(UsualScoreWordDto usualScoreDto) {
-        this.usualScoreDto = usualScoreDto;
-    }
-
-    public FinalScoreWordDto getFinalScoreDto() {
-        return finalScoreDto;
-    }
-
-    public void setFinalScoreDto(FinalScoreWordDto finalScoreDto) {
-        this.finalScoreDto = finalScoreDto;
-    }
-
-    public Double getMatrixAvgScore() {
-        return matrixAvgScore;
-    }
-
-    public void setMatrixAvgScore(Double matrixAvgScore) {
-        this.matrixAvgScore = matrixAvgScore;
-    }
-
-    @Override
-    public int compareTo(@NotNull CourseTargetWordDto o) {
-        if (o.getTargetId().longValue() < this.getTargetId().longValue()) {
-            return 1;
-        } else if (o.getTargetId().longValue() > this.getTargetId().longValue()) {
-            return -1;
-        } else {
-            return 0;
-        }
-    }
-}

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/dto/report/DimensionDto.java

@@ -1,134 +0,0 @@
-package com.qmth.distributed.print.business.bean.dto.report;
-
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import io.swagger.annotations.ApiModelProperty;
-import org.jetbrains.annotations.NotNull;
-
-import java.io.Serializable;
-
-/**
- * @Description: 课程知识点dto
- * @Param:
- * @return:
- * @Author: wangliang
- * @Date: 2024/2/26
- */
-@JsonInclude(JsonInclude.Include.NON_NULL)
-public class DimensionDto implements Serializable, Comparable<DimensionDto> {
-
-    @JsonSerialize(using = ToStringSerializer.class)
-    @ApiModelProperty(value = "课程目标id")
-    private Long targetId;
-
-    @JsonSerialize(using = ToStringSerializer.class)
-    @ApiModelProperty(value = "知识点id")
-    private Long dimensionId;
-
-    @ApiModelProperty(value = "知识点编码")
-    private String dimensionCode;
-
-    @ApiModelProperty(value = "知识点名称")
-    private String dimensionName;
-
-    @ApiModelProperty(value = "知识点分数")
-    private Double dimensionScore;
-
-    @ApiModelProperty(value = "换算分数")
-    private Double dimensionMatrixScore;
-
-    @ApiModelProperty(value = "换算平均分")
-    private Double dimensionMatrixAvgScore;
-
-    public DimensionDto() {
-
-    }
-
-    public DimensionDto(DimensionDto dimensionDto) {
-        this.targetId = dimensionDto.getTargetId();
-        this.dimensionId = dimensionDto.getDimensionId();
-        this.dimensionCode = dimensionDto.getDimensionCode();
-        this.dimensionName = dimensionDto.getDimensionName();
-        this.dimensionScore = dimensionDto.getDimensionScore();
-        this.dimensionMatrixScore = dimensionDto.getDimensionMatrixScore();
-        this.dimensionMatrixAvgScore = dimensionDto.getDimensionMatrixAvgScore();
-    }
-
-    public DimensionDto(Long targetId, DimensionDto dimensionDto, Double dimensionScore) {
-        this.targetId = targetId;
-        this.dimensionId = dimensionDto.getDimensionId();
-        this.dimensionCode = dimensionDto.getDimensionCode();
-        this.dimensionName = dimensionDto.getDimensionName();
-        this.dimensionScore = dimensionScore;
-    }
-
-    public DimensionDto(Long targetId, DimensionDto dimensionDto, Double dimensionScore, Double dimensionMatrixScore) {
-        this.targetId = targetId;
-        this.dimensionId = dimensionDto.getDimensionId();
-        this.dimensionCode = dimensionDto.getDimensionCode();
-        this.dimensionName = dimensionDto.getDimensionName();
-        this.dimensionScore = dimensionScore;
-        this.dimensionMatrixScore = dimensionMatrixScore;
-    }
-    public Double getDimensionMatrixScore() {
-        return dimensionMatrixScore;
-    }
-
-    public void setDimensionMatrixScore(Double dimensionMatrixScore) {
-        this.dimensionMatrixScore = dimensionMatrixScore;
-    }
-
-    public Double getDimensionMatrixAvgScore() {
-        return dimensionMatrixAvgScore;
-    }
-
-    public void setDimensionMatrixAvgScore(Double dimensionMatrixAvgScore) {
-        this.dimensionMatrixAvgScore = dimensionMatrixAvgScore;
-    }
-
-    public Long getTargetId() {
-        return targetId;
-    }
-
-    public void setTargetId(Long targetId) {
-        this.targetId = targetId;
-    }
-
-    public Long getDimensionId() {
-        return dimensionId;
-    }
-
-    public void setDimensionId(Long dimensionId) {
-        this.dimensionId = dimensionId;
-    }
-
-    public String getDimensionCode() {
-        return dimensionCode;
-    }
-
-    public void setDimensionCode(String dimensionCode) {
-        this.dimensionCode = dimensionCode;
-    }
-
-    public String getDimensionName() {
-        return dimensionName;
-    }
-
-    public void setDimensionName(String dimensionName) {
-        this.dimensionName = dimensionName;
-    }
-
-    public Double getDimensionScore() {
-        return dimensionScore;
-    }
-
-    public void setDimensionScore(Double dimensionScore) {
-        this.dimensionScore = dimensionScore;
-    }
-
-    @Override
-    public int compareTo(@NotNull DimensionDto o) {
-        return this.getDimensionCode().compareTo(o.getDimensionCode());
-    }
-}

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/dto/report/FinalScoreWordDto.java

@@ -1,124 +0,0 @@
-package com.qmth.distributed.print.business.bean.dto.report;
-
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.qmth.distributed.print.business.bean.dto.CourseWeightDetailDto;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.List;
-
-/**
- * @Description: 期末成绩dto
- * @Param:
- * @return:
- * @Author: wangliang
- * @Date: 2024/2/26
- */
-@JsonInclude(JsonInclude.Include.NON_NULL)
-public class FinalScoreWordDto implements Serializable {
-
-    @JsonSerialize(using = ToStringSerializer.class)
-    @ApiModelProperty(value = "课程目标id")
-    private Long targetId;
-
-    @JsonSerialize(using = ToStringSerializer.class)
-    @ApiModelProperty(value = "评价方式id")
-    private Long evaluationId;
-
-    @ApiModelProperty(value = "评价方式")
-    private String evaluation;
-
-    @ApiModelProperty(value = "评价方式描述")
-    private String evaluationDesc;
-
-    @ApiModelProperty(value = "期末成绩目标总分")
-    private BigDecimal finalScoreTargetSumScore = new BigDecimal(0);
-
-    @ApiModelProperty(value = "期末成绩目标整体权重")
-    private BigDecimal finalScoreSumWeight = new BigDecimal(0);
-
-    @ApiModelProperty(value = "期末成绩知识点分数")
-    private Double finalScoreDimensionScore;
-
-    @ApiModelProperty(value = "知识点集合")
-    private List<DimensionDto> dimensionList;
-
-    public FinalScoreWordDto() {
-
-    }
-
-    public FinalScoreWordDto(Long targetId, CourseWeightDetailDto courseWeightDetailDto, BigDecimal finalScoreSumWeight) {
-        this.targetId = targetId;
-        this.evaluationId = courseWeightDetailDto.getEvaluationId();
-        this.evaluation = courseWeightDetailDto.getEvaluationName();
-        this.finalScoreSumWeight = finalScoreSumWeight;
-        this.finalScoreTargetSumScore = courseWeightDetailDto.getTargetScore();
-    }
-
-    public Long getTargetId() {
-        return targetId;
-    }
-
-    public void setTargetId(Long targetId) {
-        this.targetId = targetId;
-    }
-
-    public List<DimensionDto> getDimensionList() {
-        return dimensionList;
-    }
-
-    public void setDimensionList(List<DimensionDto> dimensionList) {
-        this.dimensionList = dimensionList;
-    }
-
-    public BigDecimal getFinalScoreTargetSumScore() {
-        return finalScoreTargetSumScore;
-    }
-
-    public void setFinalScoreTargetSumScore(BigDecimal finalScoreTargetSumScore) {
-        this.finalScoreTargetSumScore = finalScoreTargetSumScore;
-    }
-
-    public BigDecimal getFinalScoreSumWeight() {
-        return finalScoreSumWeight;
-    }
-
-    public void setFinalScoreSumWeight(BigDecimal finalScoreSumWeight) {
-        this.finalScoreSumWeight = finalScoreSumWeight;
-    }
-
-    public Double getFinalScoreDimensionScore() {
-        return finalScoreDimensionScore;
-    }
-
-    public void setFinalScoreDimensionScore(Double finalScoreDimensionScore) {
-        this.finalScoreDimensionScore = finalScoreDimensionScore;
-    }
-
-    public Long getEvaluationId() {
-        return evaluationId;
-    }
-
-    public void setEvaluationId(Long evaluationId) {
-        this.evaluationId = evaluationId;
-    }
-
-    public String getEvaluation() {
-        return evaluation;
-    }
-
-    public void setEvaluation(String evaluation) {
-        this.evaluation = evaluation;
-    }
-
-    public String getEvaluationDesc() {
-        return evaluationDesc;
-    }
-
-    public void setEvaluationDesc(String evaluationDesc) {
-        this.evaluationDesc = evaluationDesc;
-    }
-}

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/dto/report/ReportCommonDto.java

@@ -1,87 +0,0 @@
-package com.qmth.distributed.print.business.bean.dto.report;
-
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.io.Serializable;
-
-/**
- * @Description: 报告公共dto
- * @Param:
- * @return:
- * @Author: wangliang
- * @Date: 2024/2/26
- */
-public class ReportCommonDto implements Serializable {
-
-    @JsonSerialize(using = ToStringSerializer.class)
-    @ApiModelProperty(value = "考试id")
-    private Long examId;
-
-    @JsonSerialize(using = ToStringSerializer.class)
-    @ApiModelProperty(value = "课程id")
-    private Long courseId;
-
-    @ApiModelProperty(value = "课程编码")
-    private String courseCode;
-
-    @ApiModelProperty(value = "课程名称")
-    private String courseName;
-
-    @ApiModelProperty(value = "试卷编码")
-    private String paperNumber;
-
-    public ReportCommonDto() {
-
-    }
-
-    public ReportCommonDto(Long examId, Long courseId, String courseCode, String courseName, String paperNumber) {
-        this.examId = examId;
-        this.courseId = courseId;
-        this.courseCode = courseCode;
-        this.courseName = courseName;
-        this.paperNumber = paperNumber;
-    }
-
-    public Long getExamId() {
-        return examId;
-    }
-
-    public void setExamId(Long examId) {
-        this.examId = examId;
-    }
-
-    public Long getCourseId() {
-        return courseId;
-    }
-
-    public void setCourseId(Long courseId) {
-        this.courseId = courseId;
-    }
-
-    public String getCourseCode() {
-        return courseCode;
-    }
-
-    public void setCourseCode(String courseCode) {
-        this.courseCode = courseCode;
-    }
-
-    public String getCourseName() {
-        return courseName;
-    }
-
-    public void setCourseName(String courseName) {
-        this.courseName = courseName;
-    }
-
-    public String getPaperNumber() {
-        return paperNumber;
-    }
-
-    public void setPaperNumber(String paperNumber) {
-        this.paperNumber = paperNumber;
-    }
-}

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/dto/report/ReportCourseBasicInfoDto.java

@@ -1,168 +0,0 @@
-package com.qmth.distributed.print.business.bean.dto.report;
-
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.qmth.distributed.print.business.entity.TRBasicInfo;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.io.Serializable;
-
-/**
- * @Description: 报告课程基本情况dto
- * @Param:
- * @return:
- * @Author: wangliang
- * @Date: 2024/2/26
- */
-public class ReportCourseBasicInfoDto implements Serializable {
-
-    @ApiModelProperty(value = "课程性质")
-    private String courseType;
-
-    @ApiModelProperty(value = "学分")
-    private String credit;
-
-    @ApiModelProperty(value = "学时")
-    private String period;
-
-    @ApiModelProperty(value = "考核方式")
-    private String evaluationMode;
-
-    @ApiModelProperty(value = "开课时间")
-    private String openTime;
-
-    @ApiModelProperty(value = "授课对象")
-    private String teachingObject;
-
-    @ApiModelProperty(value = "选课人数")
-    private Integer selectionCount;
-
-    @ApiModelProperty(value = "参评人数")
-    private Integer participantCount;
-
-    @ApiModelProperty(value = "课程目标达成度期望值")
-    private Double courseDegree;
-
-    @ApiModelProperty(value = "任课老师")
-    private String teacher;
-
-    @ApiModelProperty(value = "评价责任人")
-    private String director;
-
-    @ApiModelProperty(value = "评价参与人")
-    private String participant;
-
-    public ReportCourseBasicInfoDto() {
-
-    }
-
-    public ReportCourseBasicInfoDto(TRBasicInfo trBasicInfo) {
-        this.courseType = trBasicInfo.getCourseType();
-        this.credit = trBasicInfo.getCredit();
-        this.period = trBasicInfo.getPeriod();
-        this.evaluationMode = trBasicInfo.getEvaluationMode();
-        this.openTime = trBasicInfo.getOpenTime();
-        this.teachingObject = trBasicInfo.getTeachingObject();
-        this.selectionCount = trBasicInfo.getSelectionCount();
-        this.participantCount = trBasicInfo.getParticipantCount();
-        this.courseDegree = trBasicInfo.getCourseDegree();
-        this.teacher = trBasicInfo.getTeacher();
-        this.director = trBasicInfo.getDirector();
-        this.participant = trBasicInfo.getParticipant();
-    }
-
-    public String getCredit() {
-        return credit;
-    }
-
-    public void setCredit(String credit) {
-        this.credit = credit;
-    }
-
-    public String getPeriod() {
-        return period;
-    }
-
-    public void setPeriod(String period) {
-        this.period = period;
-    }
-
-    public String getCourseType() {
-        return courseType;
-    }
-
-    public void setCourseType(String courseType) {
-        this.courseType = courseType;
-    }
-
-    public String getEvaluationMode() {
-        return evaluationMode;
-    }
-
-    public void setEvaluationMode(String evaluationMode) {
-        this.evaluationMode = evaluationMode;
-    }
-
-    public String getOpenTime() {
-        return openTime;
-    }
-
-    public void setOpenTime(String openTime) {
-        this.openTime = openTime;
-    }
-
-    public String getTeachingObject() {
-        return teachingObject;
-    }
-
-    public void setTeachingObject(String teachingObject) {
-        this.teachingObject = teachingObject;
-    }
-
-    public Integer getSelectionCount() {
-        return selectionCount;
-    }
-
-    public void setSelectionCount(Integer selectionCount) {
-        this.selectionCount = selectionCount;
-    }
-
-    public Integer getParticipantCount() {
-        return participantCount;
-    }
-
-    public void setParticipantCount(Integer participantCount) {
-        this.participantCount = participantCount;
-    }
-
-    public Double getCourseDegree() {
-        return courseDegree;
-    }
-
-    public void setCourseDegree(Double courseDegree) {
-        this.courseDegree = courseDegree;
-    }
-
-    public String getTeacher() {
-        return teacher;
-    }
-
-    public void setTeacher(String teacher) {
-        this.teacher = teacher;
-    }
-
-    public String getDirector() {
-        return director;
-    }
-
-    public void setDirector(String director) {
-        this.director = director;
-    }
-
-    public String getParticipant() {
-        return participant;
-    }
-
-    public void setParticipant(String participant) {
-        this.participant = participant;
-    }
-}

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/dto/report/ReportCourseEvaluationResultDetailDto.java

@@ -1,51 +0,0 @@
-package com.qmth.distributed.print.business.bean.dto.report;
-
-import io.swagger.annotations.ApiModelProperty;
-
-import java.io.Serializable;
-import java.util.List;
-
-/**
- * @Description: 报告课程考核成绩评价明细结果dto
- * @Param:
- * @return:
- * @Author: wangliang
- * @Date: 2024/2/26
- */
-public class ReportCourseEvaluationResultDetailDto implements Serializable {
-
-    @ApiModelProperty(value = "考生集合")
-    private List<ReportExamStudentDto> examStudentList;
-
-//    @ApiModelProperty(value = "课程目标达成评价值图")
-//    private List<ReportCourseTargetViewDto> courseTargetList;
-
-    public ReportCourseEvaluationResultDetailDto() {
-
-    }
-
-    public ReportCourseEvaluationResultDetailDto(List<ReportExamStudentDto> examStudentList) {
-        this.examStudentList = examStudentList;
-    }
-
-//    public ReportCourseEvaluationResultDetailDto(List<ReportExamStudentDto> examStudentList, List<ReportCourseTargetViewDto> courseTargetList) {
-//        this.examStudentList = examStudentList;
-//        this.courseTargetList = courseTargetList;
-//    }
-
-    public List<ReportExamStudentDto> getExamStudentList() {
-        return examStudentList;
-    }
-
-    public void setExamStudentList(List<ReportExamStudentDto> examStudentList) {
-        this.examStudentList = examStudentList;
-    }
-
-//    public List<ReportCourseTargetViewDto> getCourseTargetList() {
-//        return courseTargetList;
-//    }
-//
-//    public void setCourseTargetList(List<ReportCourseTargetViewDto> courseTargetList) {
-//        this.courseTargetList = courseTargetList;
-//    }
-}

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/dto/report/ReportCourseEvaluationResultDto.java

@@ -1,63 +0,0 @@
-package com.qmth.distributed.print.business.bean.dto.report;
-
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.List;
-
-/**
- * @Description: 报告课程考核成绩评价结果dto
- * @Param:
- * @return:
- * @Author: wangliang
- * @Date: 2024/2/26
- */
-public class ReportCourseEvaluationResultDto implements Serializable {
-
-    @JsonSerialize(using = ToStringSerializer.class)
-    @ApiModelProperty(value = "权重变化id")
-    private Long weightSettingSign;
-
-    @ApiModelProperty(value = "课程目标总达成评价值")
-    private BigDecimal targetEvaluationSumValue;
-
-    @ApiModelProperty(value = "课程目标集合")
-    private List<CourseTargetWebDto> targetList;
-
-    public ReportCourseEvaluationResultDto() {
-
-    }
-
-    public ReportCourseEvaluationResultDto(BigDecimal targetEvaluationSumValue, List<CourseTargetWebDto> targetList, Long weightSettingSign) {
-        this.targetEvaluationSumValue = targetEvaluationSumValue;
-        this.targetList = targetList;
-        this.weightSettingSign = weightSettingSign;
-    }
-
-    public BigDecimal getTargetEvaluationSumValue() {
-        return targetEvaluationSumValue;
-    }
-
-    public void setTargetEvaluationSumValue(BigDecimal targetEvaluationSumValue) {
-        this.targetEvaluationSumValue = targetEvaluationSumValue;
-    }
-
-    public List<CourseTargetWebDto> getTargetList() {
-        return targetList;
-    }
-
-    public void setTargetList(List<CourseTargetWebDto> targetList) {
-        this.targetList = targetList;
-    }
-
-    public Long getWeightSettingSign() {
-        return weightSettingSign;
-    }
-
-    public void setWeightSettingSign(Long weightSettingSign) {
-        this.weightSettingSign = weightSettingSign;
-    }
-}

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/dto/report/ReportCourseEvaluationSpreadDto.java

@@ -1,52 +0,0 @@
-package com.qmth.distributed.print.business.bean.dto.report;
-
-import com.qmth.distributed.print.business.bean.result.report.PaperStructDimensionResult;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.io.Serializable;
-import java.util.List;
-
-/**
- * @Description: 报告课程目标考核分布dto
- * @Param:
- * @return:
- * @Author: wangliang
- * @Date: 2024/2/26
- */
-public class ReportCourseEvaluationSpreadDto implements Serializable {
-
-    @ApiModelProperty(value = "题目信息集合")
-    private List<PaperStructDimensionResult> questionInfo;
-
-    @ApiModelProperty(value = "分数图")
-    private ReportScoreViewDto scoreList;
-
-    public ReportCourseEvaluationSpreadDto() {
-
-    }
-
-    public ReportCourseEvaluationSpreadDto(List<PaperStructDimensionResult> questionInfo) {
-        this.questionInfo = questionInfo;
-    }
-
-    public ReportCourseEvaluationSpreadDto(List<PaperStructDimensionResult> questionInfo, ReportScoreViewDto scoreList) {
-        this.questionInfo = questionInfo;
-        this.scoreList = scoreList;
-    }
-
-    public List<PaperStructDimensionResult> getQuestionInfo() {
-        return questionInfo;
-    }
-
-    public void setQuestionInfo(List<PaperStructDimensionResult> questionInfo) {
-        this.questionInfo = questionInfo;
-    }
-
-    public ReportScoreViewDto getScoreList() {
-        return scoreList;
-    }
-
-    public void setScoreList(ReportScoreViewDto scoreList) {
-        this.scoreList = scoreList;
-    }
-}

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/dto/report/ReportEvaluationDto.java

@@ -1,155 +0,0 @@
-package com.qmth.distributed.print.business.bean.dto.report;
-
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.qmth.distributed.print.business.bean.dto.CourseWeightDetailDto;
-import io.swagger.annotations.ApiModelProperty;
-import org.jetbrains.annotations.NotNull;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-
-/**
- * @Description: 报告评价方式dto
- * @Param:
- * @return:
- * @Author: wangliang
- * @Date: 2024/2/26
- */
-@JsonInclude(JsonInclude.Include.NON_NULL)
-public class ReportEvaluationDto implements Serializable, Comparable<ReportEvaluationDto> {
-
-    @JsonSerialize(using = ToStringSerializer.class)
-    @ApiModelProperty(value = "课程目标id")
-    private Long targetId;
-
-    @JsonSerialize(using = ToStringSerializer.class)
-    @ApiModelProperty(value = "评价方式id")
-    private Long evaluationId;
-
-    @ApiModelProperty(value = "评价方式")
-    private String evaluation;
-
-    @ApiModelProperty(value = "评价方式描述")
-    private String evaluationDesc;
-
-    @ApiModelProperty(value = "权重")
-    private BigDecimal targetWeight;
-
-    @ApiModelProperty(value = "目标分值")
-    private BigDecimal targetScore;
-
-    @ApiModelProperty(value = "换算平均分")
-    private Double targetAvgScore;
-
-    @ApiModelProperty(value = "卷面分")
-    private Double score;
-
-    @ApiModelProperty(value = "原始目标分")
-    private Double originalTargetScore;
-
-    @ApiModelProperty(value = "原始目标权重")
-    private BigDecimal originalTargetWeight;
-
-    public ReportEvaluationDto() {
-
-    }
-
-    public ReportEvaluationDto(Long targetId, CourseWeightDetailDto courseWeightDetailDto, BigDecimal targetWeight, Double score, Double originalTargetScore) {
-        this.targetId = targetId;
-        this.evaluationId = courseWeightDetailDto.getEvaluationId();
-        this.evaluation = courseWeightDetailDto.getEvaluationName();
-        this.evaluationDesc = courseWeightDetailDto.getEvaluationDesc();
-        this.targetWeight = targetWeight;
-        this.targetScore = courseWeightDetailDto.getTargetScore();
-        this.score = score;
-        this.originalTargetWeight = courseWeightDetailDto.getWeight();
-        this.originalTargetScore = originalTargetScore;
-    }
-
-    public Double getOriginalTargetScore() {
-        return originalTargetScore;
-    }
-
-    public void setOriginalTargetScore(Double originalTargetScore) {
-        this.originalTargetScore = originalTargetScore;
-    }
-
-    public BigDecimal getOriginalTargetWeight() {
-        return originalTargetWeight;
-    }
-
-    public void setOriginalTargetWeight(BigDecimal originalTargetWeight) {
-        this.originalTargetWeight = originalTargetWeight;
-    }
-
-    public Double getScore() {
-        return score;
-    }
-
-    public void setScore(Double score) {
-        this.score = score;
-    }
-
-    public Double getTargetAvgScore() {
-        return targetAvgScore;
-    }
-
-    public void setTargetAvgScore(Double targetAvgScore) {
-        this.targetAvgScore = targetAvgScore;
-    }
-
-    public Long getTargetId() {
-        return targetId;
-    }
-
-    public void setTargetId(Long targetId) {
-        this.targetId = targetId;
-    }
-
-    public Long getEvaluationId() {
-        return evaluationId;
-    }
-
-    public void setEvaluationId(Long evaluationId) {
-        this.evaluationId = evaluationId;
-    }
-
-    public String getEvaluation() {
-        return evaluation;
-    }
-
-    public void setEvaluation(String evaluation) {
-        this.evaluation = evaluation;
-    }
-
-    public String getEvaluationDesc() {
-        return evaluationDesc;
-    }
-
-    public void setEvaluationDesc(String evaluationDesc) {
-        this.evaluationDesc = evaluationDesc;
-    }
-
-    public BigDecimal getTargetWeight() {
-        return targetWeight;
-    }
-
-    public void setTargetWeight(BigDecimal targetWeight) {
-        this.targetWeight = targetWeight;
-    }
-
-    public BigDecimal getTargetScore() {
-        return targetScore;
-    }
-
-    public void setTargetScore(BigDecimal targetScore) {
-        this.targetScore = targetScore;
-    }
-
-    @Override
-    public int compareTo(@NotNull ReportEvaluationDto o) {
-        return this.getEvaluation().compareTo(o.getEvaluation());
-    }
-}

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/dto/report/ReportExamStudentDto.java

@@ -1,103 +0,0 @@
-package com.qmth.distributed.print.business.bean.dto.report;
-
-import com.google.gson.reflect.TypeToken;
-import com.qmth.distributed.print.business.bean.result.FinalScoreResult;
-import com.qmth.distributed.print.business.entity.TRExamStudent;
-import com.qmth.teachcloud.common.util.GsonUtil;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.io.Serializable;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * @Description: 报告课程考核成绩评价明细结果-考生dto
- * @Param:
- * @return:
- * @Author: wangliang
- * @Date: 2024/2/26
- */
-public class ReportExamStudentDto implements Serializable {
-
-    @ApiModelProperty(value = "考生姓名")
-    private String name;
-
-    @ApiModelProperty(value = "学号")
-    private String studentCode;
-
-    @ApiModelProperty(value = "行政班级")
-    private String administrativeClass;
-
-    @ApiModelProperty(value = "综合成绩")
-    private Double score;
-
-    @ApiModelProperty(value = "课程目标集合")
-    private List<ReportExamStudentTargetDto> targetList;
-
-    public ReportExamStudentDto() {
-
-    }
-
-    public ReportExamStudentDto(TRExamStudent trExamStudent) {
-        this.name = trExamStudent.getName();
-        this.studentCode = trExamStudent.getStudentCode();
-        this.administrativeClass = trExamStudent.getAdministrativeClass();
-        this.score = trExamStudent.getScore();
-        this.targetList = GsonUtil.fromJson(trExamStudent.getResultDetail(), new TypeToken<List<ReportExamStudentTargetDto>>() {
-        }.getType());
-    }
-
-    public ReportExamStudentDto(String name, String studentCode, String administrativeClass, Double score, List<ReportExamStudentTargetDto> targetList) {
-        this.name = name;
-        this.studentCode = studentCode;
-        this.administrativeClass = administrativeClass;
-        this.score = score;
-        this.targetList = targetList;
-    }
-
-    public ReportExamStudentDto(FinalScoreResult finalScoreResult) {
-        this.name = finalScoreResult.getName();
-        this.studentCode = finalScoreResult.getStudentCode();
-        this.administrativeClass = finalScoreResult.getAdministrativeClass();
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getStudentCode() {
-        return studentCode;
-    }
-
-    public void setStudentCode(String studentCode) {
-        this.studentCode = studentCode;
-    }
-
-    public String getAdministrativeClass() {
-        return administrativeClass;
-    }
-
-    public void setAdministrativeClass(String administrativeClass) {
-        this.administrativeClass = administrativeClass;
-    }
-
-    public Double getScore() {
-        return Objects.isNull(score) ? 0.0d : score;
-    }
-
-    public void setScore(Double score) {
-        this.score = score;
-    }
-
-    public List<ReportExamStudentTargetDto> getTargetList() {
-        return targetList;
-    }
-
-    public void setTargetList(List<ReportExamStudentTargetDto> targetList) {
-        this.targetList = targetList;
-    }
-}

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/dto/report/ReportExamStudentFinalScoreDto.java

@@ -1,191 +0,0 @@
-package com.qmth.distributed.print.business.bean.dto.report;
-
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.List;
-
-/**
- * @Description: 报告课程考核成绩评价明细结果-考生-期末成绩dto
- * @Param:
- * @return:
- * @Author: wangliang
- * @Date: 2024/2/26
- */
-@JsonInclude(JsonInclude.Include.NON_NULL)
-public class ReportExamStudentFinalScoreDto implements Serializable {
-
-    @JsonSerialize(using = ToStringSerializer.class)
-    @ApiModelProperty(value = "评价方式id")
-    private Long evaluationId;
-
-    @ApiModelProperty(value = "评价方式")
-    private String evaluation;
-
-    @ApiModelProperty(value = "评价方式描述")
-    private String evaluationDesc;
-
-    @ApiModelProperty(value = "权重")
-    private BigDecimal targetWeight;
-
-    @ApiModelProperty(value = "目标分值")
-    private BigDecimal targetScore;
-
-    @ApiModelProperty(value = "课程目标知识点转换总分")
-    private Double targetDimensionMatrixSumScore;
-
-    @ApiModelProperty(value = "课程目标集合")
-    private List<DimensionDto> dimensionList;
-
-    @ApiModelProperty(value = "课程目标考核要素的平均分")
-    private Double matrixAvgScore;
-
-    @ApiModelProperty(value = "知识点卷面总分")
-    private Double dimensionScoreSum;
-
-    @ApiModelProperty(value = "课程卷面总分")
-    private Double targetScoreSum;
-
-    @ApiModelProperty(value = "课程目标转换总分")
-    private Double targetMatrixSumScore;
-
-    public ReportExamStudentFinalScoreDto() {
-
-    }
-
-    public ReportExamStudentFinalScoreDto(FinalScoreWordDto finalScoreWordDto, List<DimensionDto> dimensionList, Double dimensionScoreSum) {
-        this.evaluationId = finalScoreWordDto.getEvaluationId();
-        this.evaluation = finalScoreWordDto.getEvaluation();
-        this.evaluationDesc = finalScoreWordDto.getEvaluationDesc();
-        this.targetWeight = finalScoreWordDto.getFinalScoreSumWeight();
-        this.targetScore = finalScoreWordDto.getFinalScoreTargetSumScore();
-        this.dimensionList = dimensionList;
-        this.dimensionScoreSum = dimensionScoreSum;
-    }
-
-    public ReportExamStudentFinalScoreDto(FinalScoreWordDto finalScoreWordDto, List<DimensionDto> dimensionList, Double targetDimensionMatrixSumScore, Double dimensionScoreSum) {
-        this.evaluationId = finalScoreWordDto.getEvaluationId();
-        this.evaluation = finalScoreWordDto.getEvaluation();
-        this.evaluationDesc = finalScoreWordDto.getEvaluationDesc();
-        this.targetWeight = finalScoreWordDto.getFinalScoreSumWeight();
-        this.targetScore = finalScoreWordDto.getFinalScoreTargetSumScore();
-        this.dimensionList = dimensionList;
-        this.targetDimensionMatrixSumScore = targetDimensionMatrixSumScore;
-        this.dimensionScoreSum = dimensionScoreSum;
-    }
-
-    public ReportExamStudentFinalScoreDto(FinalScoreWordDto finalScoreWordDto, Double targetScoreSum) {
-        this.evaluationId = finalScoreWordDto.getEvaluationId();
-        this.evaluation = finalScoreWordDto.getEvaluation();
-        this.evaluationDesc = finalScoreWordDto.getEvaluationDesc();
-        this.targetWeight = finalScoreWordDto.getFinalScoreSumWeight();
-        this.targetScore = finalScoreWordDto.getFinalScoreTargetSumScore();
-        this.targetScoreSum = targetScoreSum;
-    }
-
-    public ReportExamStudentFinalScoreDto(FinalScoreWordDto finalScoreWordDto, Double targetMatrixSumScore, Double targetScoreSum) {
-        this.evaluationId = finalScoreWordDto.getEvaluationId();
-        this.evaluation = finalScoreWordDto.getEvaluation();
-        this.evaluationDesc = finalScoreWordDto.getEvaluationDesc();
-        this.targetWeight = finalScoreWordDto.getFinalScoreSumWeight();
-        this.targetScore = finalScoreWordDto.getFinalScoreTargetSumScore();
-        this.targetMatrixSumScore = targetMatrixSumScore;
-        this.targetScoreSum = targetScoreSum;
-    }
-
-    public Double getTargetDimensionMatrixSumScore() {
-        return targetDimensionMatrixSumScore;
-    }
-
-    public void setTargetDimensionMatrixSumScore(Double targetDimensionMatrixSumScore) {
-        this.targetDimensionMatrixSumScore = targetDimensionMatrixSumScore;
-    }
-
-    public Double getDimensionScoreSum() {
-        return dimensionScoreSum;
-    }
-
-    public void setDimensionScoreSum(Double dimensionScoreSum) {
-        this.dimensionScoreSum = dimensionScoreSum;
-    }
-
-    public Double getTargetScoreSum() {
-        return targetScoreSum;
-    }
-
-    public void setTargetScoreSum(Double targetScoreSum) {
-        this.targetScoreSum = targetScoreSum;
-    }
-
-    public Double getTargetMatrixSumScore() {
-        return targetMatrixSumScore;
-    }
-
-    public void setTargetMatrixSumScore(Double targetMatrixSumScore) {
-        this.targetMatrixSumScore = targetMatrixSumScore;
-    }
-
-    public Double getMatrixAvgScore() {
-        return matrixAvgScore;
-    }
-
-    public void setMatrixAvgScore(Double matrixAvgScore) {
-        this.matrixAvgScore = matrixAvgScore;
-    }
-
-    public Long getEvaluationId() {
-        return evaluationId;
-    }
-
-    public void setEvaluationId(Long evaluationId) {
-        this.evaluationId = evaluationId;
-    }
-
-    public String getEvaluation() {
-        return evaluation;
-    }
-
-    public void setEvaluation(String evaluation) {
-        this.evaluation = evaluation;
-    }
-
-    public String getEvaluationDesc() {
-        return evaluationDesc;
-    }
-
-    public void setEvaluationDesc(String evaluationDesc) {
-        this.evaluationDesc = evaluationDesc;
-    }
-
-    public ReportExamStudentFinalScoreDto(List<DimensionDto> dimensionList) {
-        this.dimensionList = dimensionList;
-    }
-
-    public BigDecimal getTargetWeight() {
-        return targetWeight;
-    }
-
-    public void setTargetWeight(BigDecimal targetWeight) {
-        this.targetWeight = targetWeight;
-    }
-
-    public BigDecimal getTargetScore() {
-        return targetScore;
-    }
-
-    public void setTargetScore(BigDecimal targetScore) {
-        this.targetScore = targetScore;
-    }
-
-    public List<DimensionDto> getDimensionList() {
-        return dimensionList;
-    }
-
-    public void setDimensionList(List<DimensionDto> dimensionList) {
-        this.dimensionList = dimensionList;
-    }
-}

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/dto/report/ReportExamStudentTargetDto.java

@@ -1,158 +0,0 @@
-package com.qmth.distributed.print.business.bean.dto.report;
-
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import io.swagger.annotations.ApiModelProperty;
-import org.jetbrains.annotations.NotNull;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-
-/**
- * @Description: 报告课程考核成绩评价明细结果-考生-目标dto
- * @Param:
- * @return:
- * @Author: wangliang
- * @Date: 2024/2/26
- */
-@JsonInclude(JsonInclude.Include.NON_NULL)
-public class ReportExamStudentTargetDto implements Serializable, Comparable<ReportExamStudentTargetDto> {
-
-    @ApiModelProperty(value = "课程目标id")
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long targetId;
-
-    @ApiModelProperty(value = "课程目标名称")
-    private String targetName;
-
-    @ApiModelProperty(value = "毕业要求")
-    private String graduationRequirement;
-
-    @ApiModelProperty(value = "目标整体权重")
-    private BigDecimal targetSumWeight;
-
-    @ApiModelProperty(value = "目标整体分值")
-    private BigDecimal targetSumScore;
-
-    @ApiModelProperty(value = "目标达成评价值")
-    private BigDecimal evaluationValue;
-
-    @ApiModelProperty(value = "各课程目标平均分")
-    private Double targetMatrixAvgScore;
-
-    @ApiModelProperty(value = "期末成绩")
-    private ReportExamStudentFinalScoreDto finalScore;
-
-    @ApiModelProperty(value = "平时成绩")
-    private ReportExamStudentUsualScoreDto usualScore;
-
-    public ReportExamStudentTargetDto() {
-
-    }
-
-    public ReportExamStudentTargetDto(CourseTargetWordDto courseTargetWordDto, ReportExamStudentFinalScoreDto finalScore, ReportExamStudentUsualScoreDto usualScore) {
-        this.targetId = courseTargetWordDto.getTargetId();
-        this.targetName = courseTargetWordDto.getTargetName();
-        this.graduationRequirement = courseTargetWordDto.getGraduationRequirement();
-        this.targetSumWeight = courseTargetWordDto.getTargetSumWeight();
-        this.targetSumScore = courseTargetWordDto.getTargetSumScore();
-        this.finalScore = finalScore;
-        this.usualScore = usualScore;
-    }
-
-    public ReportExamStudentTargetDto(ReportExamStudentTargetDto reportExamStudentTargetDto) {
-        this.targetId = reportExamStudentTargetDto.getTargetId();
-        this.targetName = reportExamStudentTargetDto.getTargetName();
-        this.graduationRequirement = reportExamStudentTargetDto.getGraduationRequirement();
-        this.evaluationValue = reportExamStudentTargetDto.getEvaluationValue();
-        this.targetMatrixAvgScore = reportExamStudentTargetDto.getTargetMatrixAvgScore();
-        this.targetSumWeight = reportExamStudentTargetDto.getTargetSumWeight();
-        this.targetSumScore = reportExamStudentTargetDto.getTargetSumScore();
-        this.finalScore = reportExamStudentTargetDto.getFinalScore();
-        this.usualScore = reportExamStudentTargetDto.getUsualScore();
-    }
-
-    public Double getTargetMatrixAvgScore() {
-        return targetMatrixAvgScore;
-    }
-
-    public void setTargetMatrixAvgScore(Double targetMatrixAvgScore) {
-        this.targetMatrixAvgScore = targetMatrixAvgScore;
-    }
-
-    public Long getTargetId() {
-        return targetId;
-    }
-
-    public void setTargetId(Long targetId) {
-        this.targetId = targetId;
-    }
-
-    public String getTargetName() {
-        return targetName;
-    }
-
-    public void setTargetName(String targetName) {
-        this.targetName = targetName;
-    }
-
-    public ReportExamStudentFinalScoreDto getFinalScore() {
-        return finalScore;
-    }
-
-    public void setFinalScore(ReportExamStudentFinalScoreDto finalScore) {
-        this.finalScore = finalScore;
-    }
-
-    public ReportExamStudentUsualScoreDto getUsualScore() {
-        return usualScore;
-    }
-
-    public void setUsualScore(ReportExamStudentUsualScoreDto usualScore) {
-        this.usualScore = usualScore;
-    }
-
-    public String getGraduationRequirement() {
-        return graduationRequirement;
-    }
-
-    public void setGraduationRequirement(String graduationRequirement) {
-        this.graduationRequirement = graduationRequirement;
-    }
-
-    public BigDecimal getTargetSumWeight() {
-        return targetSumWeight;
-    }
-
-    public void setTargetSumWeight(BigDecimal targetSumWeight) {
-        this.targetSumWeight = targetSumWeight;
-    }
-
-    public BigDecimal getTargetSumScore() {
-        return targetSumScore;
-    }
-
-    public void setTargetSumScore(BigDecimal targetSumScore) {
-        this.targetSumScore = targetSumScore;
-    }
-
-    public BigDecimal getEvaluationValue() {
-        return evaluationValue;
-    }
-
-    public void setEvaluationValue(BigDecimal evaluationValue) {
-        this.evaluationValue = evaluationValue;
-    }
-
-    @Override
-    public int compareTo(@NotNull ReportExamStudentTargetDto o) {
-        if (o.getTargetId().longValue() < this.getTargetId().longValue()) {
-            return 1;
-        } else if (o.getTargetId().longValue() > this.getTargetId().longValue()) {
-            return -1;
-        } else {
-            return 0;
-        }
-    }
-}

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/dto/report/ReportExamStudentUsualScoreDto.java

@@ -1,72 +0,0 @@
-package com.qmth.distributed.print.business.bean.dto.report;
-
-import com.fasterxml.jackson.annotation.JsonInclude;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @Description: 报告课程考核成绩评价明细结果-考生-平时成绩dto
- * @Param:
- * @return:
- * @Author: wangliang
- * @Date: 2024/2/26
- */
-@JsonInclude(JsonInclude.Include.NON_NULL)
-public class ReportExamStudentUsualScoreDto implements Serializable {
-
-    @ApiModelProperty(value = "权重")
-    private BigDecimal targetWeight;
-
-    @ApiModelProperty(value = "平时成绩对象集合")
-    private Map<Long, List<ReportExamStudentUsualScoreObjDto>> scoreMap;
-
-    @ApiModelProperty(value = "平时成绩对象集合")
-    private List<ReportExamStudentUsualScoreObjDto> scoreList;
-
-    public ReportExamStudentUsualScoreDto() {
-
-    }
-
-    public ReportExamStudentUsualScoreDto(BigDecimal targetSumWeight, List<ReportExamStudentUsualScoreObjDto> scoreList) {
-        this.targetWeight = targetSumWeight;
-        this.scoreList = scoreList;
-    }
-
-    public ReportExamStudentUsualScoreDto(ReportExamStudentUsualScoreDto reportExamStudentUsualScoreDto) {
-        this.targetWeight = reportExamStudentUsualScoreDto.getTargetWeight();
-        this.scoreMap = reportExamStudentUsualScoreDto.getScoreMap();
-        this.scoreList = reportExamStudentUsualScoreDto.getScoreList();
-    }
-
-    public BigDecimal getTargetWeight() {
-        return targetWeight;
-    }
-
-    public void setTargetWeight(BigDecimal targetWeight) {
-        this.targetWeight = targetWeight;
-    }
-
-    public ReportExamStudentUsualScoreDto(Map<Long, List<ReportExamStudentUsualScoreObjDto>> scoreMap) {
-        this.scoreMap = scoreMap;
-    }
-
-    public Map<Long, List<ReportExamStudentUsualScoreObjDto>> getScoreMap() {
-        return scoreMap;
-    }
-
-    public void setScoreMap(Map<Long, List<ReportExamStudentUsualScoreObjDto>> scoreMap) {
-        this.scoreMap = scoreMap;
-    }
-
-    public List<ReportExamStudentUsualScoreObjDto> getScoreList() {
-        return scoreList;
-    }
-
-    public void setScoreList(List<ReportExamStudentUsualScoreObjDto> scoreList) {
-        this.scoreList = scoreList;
-    }
-}

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/dto/report/ReportExamStudentUsualScoreObjDto.java

@@ -1,179 +0,0 @@
-package com.qmth.distributed.print.business.bean.dto.report;
-
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import io.swagger.annotations.ApiModelProperty;
-import org.jetbrains.annotations.NotNull;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-
-/**
- * @Description: 报告课程考核成绩评价明细结果-考生-平时成绩对象dto
- * @Param:
- * @return:
- * @Author: wangliang
- * @Date: 2024/2/26
- */
-@JsonInclude(JsonInclude.Include.NON_NULL)
-public class ReportExamStudentUsualScoreObjDto implements Serializable, Comparable<ReportExamStudentUsualScoreObjDto> {
-
-    @JsonSerialize(using = ToStringSerializer.class)
-    @ApiModelProperty(value = "课程目标id")
-    private Long targetId;
-
-    @JsonSerialize(using = ToStringSerializer.class)
-    @ApiModelProperty(value = "评价方式id")
-    private Long evaluationId;
-
-    @ApiModelProperty(value = "评价方式")
-    private String evaluation;
-
-    @ApiModelProperty(value = "评价方式描述")
-    private String evaluationDesc;
-
-    @ApiModelProperty(value = "作业权重")
-    private BigDecimal targetWeight;
-
-    @ApiModelProperty(value = "作业目标分值")
-    private BigDecimal targetScore;
-
-    @ApiModelProperty(value = "作业整体权重")
-    private BigDecimal targetSumWeight;
-
-    @ApiModelProperty(value = "作业整体分值")
-    private BigDecimal targetSumScore;
-
-    @ApiModelProperty(value = "卷面分数")
-    private Double score;
-
-    @ApiModelProperty(value = "换算分数")
-    private Double matrixScore;
-
-    @ApiModelProperty(value = "课程目标考核要素的平均分")
-    private Double matrixAvgScore;
-
-    public ReportExamStudentUsualScoreObjDto() {
-
-    }
-
-    public ReportExamStudentUsualScoreObjDto(ReportExamStudentUsualScoreObjDto reportExamStudentUsualScoreObjDto) {
-        this.targetId = reportExamStudentUsualScoreObjDto.getTargetId();
-        this.evaluationId = reportExamStudentUsualScoreObjDto.getEvaluationId();
-        this.evaluation = reportExamStudentUsualScoreObjDto.getEvaluation();
-        this.evaluationDesc = reportExamStudentUsualScoreObjDto.getEvaluationDesc();
-        this.targetWeight = reportExamStudentUsualScoreObjDto.getTargetWeight();
-        this.targetScore = reportExamStudentUsualScoreObjDto.getTargetScore();
-        this.score = reportExamStudentUsualScoreObjDto.getScore();
-        this.matrixScore = reportExamStudentUsualScoreObjDto.getMatrixScore();
-        this.targetSumScore = reportExamStudentUsualScoreObjDto.targetSumScore;
-        this.targetSumWeight = reportExamStudentUsualScoreObjDto.getTargetSumWeight();
-    }
-
-    public ReportExamStudentUsualScoreObjDto(Long targetId, ReportEvaluationDto reportEvaluationDto, Double score, Double matrixScore, BigDecimal targetSumWeight, BigDecimal targetSumScore) {
-        this.evaluationId = reportEvaluationDto.getEvaluationId();
-        this.evaluation = reportEvaluationDto.getEvaluation();
-        this.evaluationDesc = reportEvaluationDto.getEvaluationDesc();
-        this.targetWeight = reportEvaluationDto.getTargetWeight();
-        this.targetScore = reportEvaluationDto.getTargetScore();
-        this.score = score;
-        this.matrixScore = matrixScore;
-        this.targetId = targetId;
-        this.targetSumScore = targetSumScore;
-        this.targetSumWeight = targetSumWeight;
-    }
-
-    public Double getMatrixAvgScore() {
-        return matrixAvgScore;
-    }
-
-    public void setMatrixAvgScore(Double matrixAvgScore) {
-        this.matrixAvgScore = matrixAvgScore;
-    }
-
-    public Long getTargetId() {
-        return targetId;
-    }
-
-    public void setTargetId(Long targetId) {
-        this.targetId = targetId;
-    }
-
-    public BigDecimal getTargetSumWeight() {
-        return targetSumWeight;
-    }
-
-    public void setTargetSumWeight(BigDecimal targetSumWeight) {
-        this.targetSumWeight = targetSumWeight;
-    }
-
-    public BigDecimal getTargetSumScore() {
-        return targetSumScore;
-    }
-
-    public void setTargetSumScore(BigDecimal targetSumScore) {
-        this.targetSumScore = targetSumScore;
-    }
-
-    public Long getEvaluationId() {
-        return evaluationId;
-    }
-
-    public void setEvaluationId(Long evaluationId) {
-        this.evaluationId = evaluationId;
-    }
-
-    public String getEvaluation() {
-        return evaluation;
-    }
-
-    public void setEvaluation(String evaluation) {
-        this.evaluation = evaluation;
-    }
-
-    public String getEvaluationDesc() {
-        return evaluationDesc;
-    }
-
-    public void setEvaluationDesc(String evaluationDesc) {
-        this.evaluationDesc = evaluationDesc;
-    }
-
-    public BigDecimal getTargetWeight() {
-        return targetWeight;
-    }
-
-    public void setTargetWeight(BigDecimal targetWeight) {
-        this.targetWeight = targetWeight;
-    }
-
-    public BigDecimal getTargetScore() {
-        return targetScore;
-    }
-
-    public void setTargetScore(BigDecimal targetScore) {
-        this.targetScore = targetScore;
-    }
-
-    public Double getScore() {
-        return score;
-    }
-
-    public void setScore(Double score) {
-        this.score = score;
-    }
-
-    public Double getMatrixScore() {
-        return matrixScore;
-    }
-
-    public void setMatrixScore(Double matrixScore) {
-        this.matrixScore = matrixScore;
-    }
-
-    @Override
-    public int compareTo(@NotNull ReportExamStudentUsualScoreObjDto o) {
-        return this.getEvaluation().compareTo(o.getEvaluation());
-    }
-}

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/dto/report/ReportScoreRangeViewDto.java

@@ -1,61 +0,0 @@
-package com.qmth.distributed.print.business.bean.dto.report;
-
-import com.fasterxml.jackson.annotation.JsonInclude;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.io.Serializable;
-
-/**
- * @Description: 报告课程目标考核分布-分数范围dto
- * @Param:
- * @return:
- * @Author: wangliang
- * @Date: 2024/2/26
- */
-@JsonInclude(JsonInclude.Include.NON_NULL)
-public class ReportScoreRangeViewDto implements Serializable {
-
-    @ApiModelProperty(value = "考生人数")
-    private Integer studentCount;
-
-    @ApiModelProperty(value = "最小分")
-    private Double minScore;
-
-    @ApiModelProperty(value = "最大分")
-    private Double maxScore;
-
-    @ApiModelProperty(value = "比率")
-    private Double rate;
-
-    public Integer getStudentCount() {
-        return studentCount;
-    }
-
-    public void setStudentCount(Integer studentCount) {
-        this.studentCount = studentCount;
-    }
-
-    public Double getMinScore() {
-        return minScore;
-    }
-
-    public void setMinScore(Double minScore) {
-        this.minScore = minScore;
-    }
-
-    public Double getMaxScore() {
-        return maxScore;
-    }
-
-    public void setMaxScore(Double maxScore) {
-        this.maxScore = maxScore;
-    }
-
-    public Double getRate() {
-        return rate;
-    }
-
-    public void setRate(Double rate) {
-        this.rate = rate;
-    }
-}

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/dto/report/ReportScoreViewDto.java

@@ -1,59 +0,0 @@
-package com.qmth.distributed.print.business.bean.dto.report;
-
-import io.swagger.annotations.ApiModelProperty;
-
-import java.io.Serializable;
-import java.util.List;
-
-/**
- * @Description: 报告课程目标考核分布-分数dto
- * @Param:
- * @return:
- * @Author: wangliang
- * @Date: 2024/2/26
- */
-public class ReportScoreViewDto implements Serializable {
-
-    @ApiModelProperty(value = "不及格人数")
-    private Integer failCount;
-
-    @ApiModelProperty(value = "不及格比率")
-    private Double failRate;
-
-    @ApiModelProperty(value = "分数范围")
-    private List<ReportScoreRangeViewDto> scoreRange;
-
-    public ReportScoreViewDto() {
-
-    }
-
-    public ReportScoreViewDto(Integer failCount, Double failRate, List<ReportScoreRangeViewDto> scoreRange) {
-        this.failCount = failCount;
-        this.failRate = failRate;
-        this.scoreRange = scoreRange;
-    }
-
-    public Integer getFailCount() {
-        return failCount;
-    }
-
-    public void setFailCount(Integer failCount) {
-        this.failCount = failCount;
-    }
-
-    public Double getFailRate() {
-        return failRate;
-    }
-
-    public void setFailRate(Double failRate) {
-        this.failRate = failRate;
-    }
-
-    public List<ReportScoreRangeViewDto> getScoreRange() {
-        return scoreRange;
-    }
-
-    public void setScoreRange(List<ReportScoreRangeViewDto> scoreRange) {
-        this.scoreRange = scoreRange;
-    }
-}

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/dto/report/UsualScoreWordDto.java

@@ -1,60 +0,0 @@
-package com.qmth.distributed.print.business.bean.dto.report;
-
-import com.fasterxml.jackson.annotation.JsonInclude;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.List;
-
-/**
- * @Description: 平时成绩dto
- * @Param:
- * @return:
- * @Author: wangliang
- * @Date: 2024/2/26
- */
-@JsonInclude(JsonInclude.Include.NON_NULL)
-public class UsualScoreWordDto implements Serializable {
-
-    @ApiModelProperty(value = "平时成绩目标总分")
-    private BigDecimal usualScoreTargetSumScore = new BigDecimal(0);
-
-    @ApiModelProperty(value = "平时成绩目标整体权重")
-    private BigDecimal usualScoreTargetSumWeight = new BigDecimal(0);
-
-    @ApiModelProperty(value = "平时成绩详情")
-    private List<ReportEvaluationDto> usualScoreDetailList;
-
-    public UsualScoreWordDto() {
-
-    }
-
-    public UsualScoreWordDto(BigDecimal usualScoreTargetSumWeight) {
-        this.usualScoreTargetSumWeight = usualScoreTargetSumWeight;
-    }
-
-    public List<ReportEvaluationDto> getUsualScoreDetailList() {
-        return usualScoreDetailList;
-    }
-
-    public void setUsualScoreDetailList(List<ReportEvaluationDto> usualScoreDetailList) {
-        this.usualScoreDetailList = usualScoreDetailList;
-    }
-
-    public BigDecimal getUsualScoreTargetSumScore() {
-        return usualScoreTargetSumScore;
-    }
-
-    public void setUsualScoreTargetSumScore(BigDecimal usualScoreTargetSumScore) {
-        this.usualScoreTargetSumScore = usualScoreTargetSumScore;
-    }
-
-    public BigDecimal getUsualScoreTargetSumWeight() {
-        return usualScoreTargetSumWeight;
-    }
-
-    public void setUsualScoreTargetSumWeight(BigDecimal usualScoreTargetSumWeight) {
-        this.usualScoreTargetSumWeight = usualScoreTargetSumWeight;
-    }
-}

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/params/AssignClazzParam.java

@@ -0,0 +1,60 @@
+package com.qmth.distributed.print.business.bean.params;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModelProperty;
+import org.hibernate.validator.constraints.Range;
+
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
+import java.util.List;
+
+/**
+ * @Description: 分配班级参数
+ * @Author: CaoZixuan
+ * @Date: 2024-03-07
+ */
+public class AssignClazzParam {
+    @ApiModelProperty("教学课程id")
+    @JsonSerialize(using = ToStringSerializer.class)
+    @NotNull(message = "缺少教学课程")
+    @Range(min = 1L, message = "缺少教学课程")
+    private Long teachCourseId;
+
+    @ApiModelProperty("教师id")
+    @JsonSerialize(using = ToStringSerializer.class)
+    @NotNull(message = "请选择教师")
+    @Range(min = 1L, message = "请选择教师")
+    private Long teacherId;
+
+    @ApiModelProperty("班级集合")
+    @JsonSerialize(using = ToStringSerializer.class)
+    @NotEmpty(message = "请选择班级")
+    @Size(min = 1, message = "请选择班级")
+    private List<Long> clazzIdList;
+
+    public Long getTeachCourseId() {
+        return teachCourseId;
+    }
+
+    public void setTeachCourseId(Long teachCourseId) {
+        this.teachCourseId = teachCourseId;
+    }
+
+    public Long getTeacherId() {
+        return teacherId;
+    }
+
+    public void setTeacherId(Long teacherId) {
+        this.teacherId = teacherId;
+    }
+
+    public List<Long> getClazzIdList() {
+        return clazzIdList;
+    }
+
+    public void setClazzIdList(List<Long> clazzIdList) {
+        this.clazzIdList = clazzIdList;
+    }
+}

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/params/CourseEvaluationParam.java

@@ -1,81 +0,0 @@
-package com.qmth.distributed.print.business.bean.params;
-
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.qmth.distributed.print.business.enums.CourseEvaluationTypeEnum;
-import io.swagger.annotations.ApiModelProperty;
-import org.hibernate.validator.constraints.Length;
-import org.hibernate.validator.constraints.Range;
-
-import javax.validation.constraints.NotNull;
-
-/**
- * @Description: 课程评价方式参数
- * @Author: CaoZixuan
- * @Date: 2024-02-29
- */
-public class CourseEvaluationParam {
-
-    @ApiModelProperty("课程评价方式id")
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long id;
-
-    @ApiModelProperty("教学课程id")
-    @JsonSerialize(using = ToStringSerializer.class)
-    @NotNull(message = "缺少教学课程")
-    @Range(min = 1L, message = "缺少教学课程")
-    private Long teachCourseId;
-
-    @ApiModelProperty("评价方式")
-    @NotNull(message = "缺少评价方式")
-    @Length(min = 1, message = "缺少评价方式")
-    private String evaluation;
-
-    @ApiModelProperty("评价方式描述")
-    @NotNull(message = "缺少评价方式描述")
-    @Length(min = 1, message = "缺少评价方式描述")
-    private String evaluationDesc;
-
-    @ApiModelProperty("评价方式类型")
-    private CourseEvaluationTypeEnum type;
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Long getTeachCourseId() {
-        return teachCourseId;
-    }
-
-    public void setTeachCourseId(Long teachCourseId) {
-        this.teachCourseId = teachCourseId;
-    }
-
-    public String getEvaluation() {
-        return evaluation;
-    }
-
-    public void setEvaluation(String evaluation) {
-        this.evaluation = evaluation;
-    }
-
-    public String getEvaluationDesc() {
-        return evaluationDesc;
-    }
-
-    public void setEvaluationDesc(String evaluationDesc) {
-        this.evaluationDesc = evaluationDesc;
-    }
-
-    public CourseEvaluationTypeEnum getType() {
-        return type;
-    }
-
-    public void setType(CourseEvaluationTypeEnum type) {
-        this.type = type;
-    }
-}

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/params/CourseTargetParam.java

@@ -1,81 +0,0 @@
-package com.qmth.distributed.print.business.bean.params;
-
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.qmth.teachcloud.common.annotation.EditKey;
-import io.swagger.annotations.ApiModelProperty;
-import org.hibernate.validator.constraints.Length;
-import org.hibernate.validator.constraints.Range;
-
-import javax.validation.constraints.NotNull;
-import java.util.List;
-
-/**
- * @Description: 课程目标参数
- * @Author: CaoZixuan
- * @Date: 2024-02-29
- */
-public class CourseTargetParam {
-
-    @ApiModelProperty("课程目标id（编辑必填）")
-    @JsonSerialize(using = ToStringSerializer.class)
-    @EditKey
-    private Long id;
-
-    @ApiModelProperty("教学课程id")
-    @JsonSerialize(using = ToStringSerializer.class)
-    @NotNull(message = "缺少教学课程id")
-    @Range(min = 1L, message = "缺少教学课程id")
-    private Long teachCourseId;
-
-    @ApiModelProperty("课程目标名称")
-    @NotNull(message = "请输入课程目标")
-    @Length(min = 1, message = "请输入课程目标")
-    private String targetName;
-
-    @ApiModelProperty("毕业要求")
-    private String degreeRequirement;
-
-    @ApiModelProperty("知识点id集合")
-    private List<Long> dimensionIdList;
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Long getTeachCourseId() {
-        return teachCourseId;
-    }
-
-    public void setTeachCourseId(Long teachCourseId) {
-        this.teachCourseId = teachCourseId;
-    }
-
-    public String getTargetName() {
-        return targetName;
-    }
-
-    public void setTargetName(String targetName) {
-        this.targetName = targetName;
-    }
-
-    public String getDegreeRequirement() {
-        return degreeRequirement;
-    }
-
-    public void setDegreeRequirement(String degreeRequirement) {
-        this.degreeRequirement = degreeRequirement;
-    }
-
-    public List<Long> getDimensionIdList() {
-        return dimensionIdList;
-    }
-
-    public void setDimensionIdList(List<Long> dimensionIdList) {
-        this.dimensionIdList = dimensionIdList;
-    }
-}

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/params/CourseWeightParam.java

@@ -1,68 +0,0 @@
-package com.qmth.distributed.print.business.bean.params;
-
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.qmth.distributed.print.business.bean.dto.CourseWeightDto;
-import io.swagger.annotations.ApiModelProperty;
-import org.hibernate.validator.constraints.Range;
-
-import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
-import java.math.BigDecimal;
-import java.util.List;
-
-/**
- * @Description: 课程权重设置参数
- * @Author: CaoZixuan
- * @Date: 2024-03-01
- */
-public class CourseWeightParam {
-
-    @ApiModelProperty("教学课程id")
-    @JsonSerialize(using = ToStringSerializer.class)
-    @NotNull(message = "缺少教学课程")
-    @Range(min = 1L, message = "缺少教学课程")
-    private Long teachCourseId;
-
-    @ApiModelProperty("默认占比")
-    private BigDecimal defaultRate;
-
-    @ApiModelProperty("自定义占比")
-    private BigDecimal customRate;
-
-    @ApiModelProperty("课程权重表单")
-    @NotEmpty(message = "缺少权重设置表单")
-    private List<CourseWeightDto> submitForm;
-
-    public Long getTeachCourseId() {
-        return teachCourseId;
-    }
-
-    public void setTeachCourseId(Long teachCourseId) {
-        this.teachCourseId = teachCourseId;
-    }
-
-    public BigDecimal getDefaultRate() {
-        return defaultRate;
-    }
-
-    public void setDefaultRate(BigDecimal defaultRate) {
-        this.defaultRate = defaultRate;
-    }
-
-    public BigDecimal getCustomRate() {
-        return customRate;
-    }
-
-    public void setCustomRate(BigDecimal customRate) {
-        this.customRate = customRate;
-    }
-
-    public List<CourseWeightDto> getSubmitForm() {
-        return submitForm;
-    }
-
-    public void setSubmitForm(List<CourseWeightDto> submitForm) {
-        this.submitForm = submitForm;
-    }
-}

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/params/TeachClazzParams.java

@@ -2,11 +2,7 @@ package com.qmth.distributed.print.business.bean.params;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.qmth.teachcloud.common.annotation.DBVerify;
-import com.qmth.teachcloud.common.annotation.EditKey;
 import io.swagger.annotations.ApiModelProperty;
-import org.hibernate.validator.constraints.Length;
-import org.hibernate.validator.constraints.Range;
 
 import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/params/TeachCourseParams.java

@@ -0,0 +1,39 @@
+package com.qmth.distributed.print.business.bean.params;
+
+import io.swagger.annotations.ApiModelProperty;
+import org.hibernate.validator.constraints.Length;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * @Description: 教学课程编辑参数
+ * @Author: CaoZixuan
+ * @Date: 2022-02-14
+ */
+public class TeachCourseParams {
+    @ApiModelProperty("课程名称")
+    @NotNull(message = "请填写课程名称")
+    @Length(message = "请填写课程名称")
+    private String courseName;
+
+    @ApiModelProperty("课程编号")
+    @NotNull(message = "请填写课程编号")
+    @Length(message = "请填写课程编号")
+    private String courseCode;
+
+    public String getCourseName() {
+        return courseName;
+    }
+
+    public void setCourseName(String courseName) {
+        this.courseName = courseName;
+    }
+
+    public String getCourseCode() {
+        return courseCode;
+    }
+
+    public void setCourseCode(String courseCode) {
+        this.courseCode = courseCode;
+    }
+}

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/params/TeacherTeamParam.java

@@ -0,0 +1,58 @@
+package com.qmth.distributed.print.business.bean.params;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModelProperty;
+import org.hibernate.validator.constraints.Length;
+import org.hibernate.validator.constraints.Range;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * @Description: 教师团队参数
+ * @Author: CaoZixuan
+ * @Date: 2023-03-16
+ */
+public class TeacherTeamParam {
+
+    @ApiModelProperty("姓名")
+    @NotNull(message = "请填写姓名")
+    @Length(message = "请填写姓名")
+    private String teacherName;
+
+    @ApiModelProperty("工号")
+    @NotNull(message = "请填写工号")
+    @Length(message = "请填写工号")
+    private String teacherCode;
+
+    @ApiModelProperty("教学课程id")
+    @NotNull(message = "缺少教学课程")
+    @Range(min = 1L, message = "缺少教学课程id")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long teachCourseId;
+
+
+    public String getTeacherName() {
+        return teacherName;
+    }
+
+    public void setTeacherName(String teacherName) {
+        this.teacherName = teacherName;
+    }
+
+    public String getTeacherCode() {
+        return teacherCode;
+    }
+
+    public void setTeacherCode(String teacherCode) {
+        this.teacherCode = teacherCode;
+    }
+
+    public Long getTeachCourseId() {
+        return teachCourseId;
+    }
+
+    public void setTeachCourseId(Long teachCourseId) {
+        this.teachCourseId = teachCourseId;
+    }
+}

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/params/professional/TPCourseParam.java

@@ -1,28 +0,0 @@
-package com.qmth.distributed.print.business.bean.params.professional;
-
-import com.qmth.distributed.print.business.entity.TPCourse;
-
-import java.util.List;
-
-public class TPCourseParam {
-
-    private Long professionalId;
-
-    private List<TPCourse> courses;
-
-    public Long getProfessionalId() {
-        return professionalId;
-    }
-
-    public void setProfessionalId(Long professionalId) {
-        this.professionalId = professionalId;
-    }
-
-    public List<TPCourse> getCourses() {
-        return courses;
-    }
-
-    public void setCourses(List<TPCourse> courses) {
-        this.courses = courses;
-    }
-}

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/result/CourseDimensionTree.java

@@ -1,83 +0,0 @@
-package com.qmth.distributed.print.business.bean.result;
-
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.qmth.distributed.print.business.bean.dto.CourseDimensionOccupiedDto;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.util.List;
-
-/**
- * @Description: 课程知识点树结果
- * @Author: CaoZixuan
- * @Date: 2024-02-28
- */
-public class CourseDimensionTree {
-    @ApiModelProperty("知识点id")
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long id;
-
-    @ApiModelProperty("知识点编号")
-    private String code;
-
-    @ApiModelProperty("知识点名称")
-    private String name;
-
-    @ApiModelProperty("占用状态")
-    private CourseDimensionOccupiedDto occupied;
-
-    @ApiModelProperty("子知识点")
-    private List<CourseDimensionTree> children;
-
-    public CourseDimensionTree(Long id, String code, String name, CourseDimensionOccupiedDto occupied,
-            List<CourseDimensionTree> children) {
-        this.id = id;
-        this.code = code;
-        this.name = name;
-        this.occupied = occupied;
-        this.children = children;
-    }
-
-    public CourseDimensionTree() {
-    }
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public String getCode() {
-        return code;
-    }
-
-    public void setCode(String code) {
-        this.code = code;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public CourseDimensionOccupiedDto getOccupied() {
-        return occupied;
-    }
-
-    public void setOccupied(CourseDimensionOccupiedDto occupied) {
-        this.occupied = occupied;
-    }
-
-    public List<CourseDimensionTree> getChildren() {
-        return children;
-    }
-
-    public void setChildren(List<CourseDimensionTree> children) {
-        this.children = children;
-    }
-}

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/result/CourseEvaluationResult.java

@@ -1,59 +0,0 @@
-package com.qmth.distributed.print.business.bean.result;
-
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.qmth.distributed.print.business.enums.CourseEvaluationTypeEnum;
-import io.swagger.annotations.ApiModelProperty;
-
-/**
- * @Description: 课程评价方式查询结果
- * @Author: CaoZixuan
- * @Date: 2024-02-29
- */
-public class CourseEvaluationResult {
-
-    @ApiModelProperty("课程评价方式id")
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long evaluationId;
-
-    @ApiModelProperty("课程评价方式")
-    private String evaluation;
-
-    @ApiModelProperty("课程评价方式描述")
-    private String evaluationDesc;
-
-    @ApiModelProperty("评价方式类型")
-    private CourseEvaluationTypeEnum type;
-
-    public Long getEvaluationId() {
-        return evaluationId;
-    }
-
-    public void setEvaluationId(Long evaluationId) {
-        this.evaluationId = evaluationId;
-    }
-
-    public String getEvaluation() {
-        return evaluation;
-    }
-
-    public void setEvaluation(String evaluation) {
-        this.evaluation = evaluation;
-    }
-
-    public String getEvaluationDesc() {
-        return evaluationDesc;
-    }
-
-    public void setEvaluationDesc(String evaluationDesc) {
-        this.evaluationDesc = evaluationDesc;
-    }
-
-    public CourseEvaluationTypeEnum getType() {
-        return type;
-    }
-
-    public void setType(CourseEvaluationTypeEnum type) {
-        this.type = type;
-    }
-}

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/result/CourseTargetResult.java

@@ -1,86 +0,0 @@
-package com.qmth.distributed.print.business.bean.result;
-
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.qmth.distributed.print.business.bean.dto.CourseDimensionDto;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.math.BigDecimal;
-import java.util.List;
-
-/**
- * @Description: 课程目标查询结果
- * @Author: CaoZixuan
- * @Date: 2024-02-28
- */
-public class CourseTargetResult {
-
-    @ApiModelProperty("课程目标id")
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long id;
-
-    @ApiModelProperty("课程目标名称")
-    private String targetName;
-
-    @ApiModelProperty("毕业要求指标")
-    @JsonIgnore
-    private String targetContent;
-
-    @ApiModelProperty("毕业要求")
-    private String degreeRequirement;
-
-    @ApiModelProperty("课程目标毕业要求")
-    private List<CourseDimensionDto> dimensionList;
-
-    @ApiModelProperty("目标整体权重")
-    private BigDecimal totalWeight;
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public String getTargetName() {
-        return targetName;
-    }
-
-    public void setTargetName(String targetName) {
-        this.targetName = targetName;
-    }
-
-    public String getTargetContent() {
-        return targetContent;
-    }
-
-    public void setTargetContent(String targetContent) {
-        this.targetContent = targetContent;
-    }
-
-    public String getDegreeRequirement() {
-        return degreeRequirement;
-    }
-
-    public void setDegreeRequirement(String degreeRequirement) {
-        this.degreeRequirement = degreeRequirement;
-    }
-
-    public List<CourseDimensionDto> getDimensionList() {
-        return dimensionList;
-    }
-
-    public void setDimensionList(List<CourseDimensionDto> dimensionList) {
-        this.dimensionList = dimensionList;
-    }
-
-    public BigDecimal getTotalWeight() {
-        return totalWeight;
-    }
-
-    public void setTotalWeight(BigDecimal totalWeight) {
-        this.totalWeight = totalWeight;
-    }
-}

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/result/CourseWeightResult.java

@@ -1,74 +0,0 @@
-package com.qmth.distributed.print.business.bean.result;
-
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.qmth.distributed.print.business.bean.dto.CourseWeightDto;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.math.BigDecimal;
-import java.util.List;
-
-/**
- * @Description: 课程权重结果
- * @Author: CaoZixuan
- * @Date: 2024-03-07
- */
-public class CourseWeightResult {
-
-    @ApiModelProperty("默认占比")
-    private BigDecimal defaultRate;
-
-    @ApiModelProperty("自定义占比")
-    private BigDecimal customRate;
-
-    @ApiModelProperty("权重设置标记")
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long weightSettingSign;
-
-    @ApiModelProperty("知识点设置标记")
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long dimensionSign;
-
-    @ApiModelProperty("课程权重表单")
-    private List<CourseWeightDto> submitForm;
-
-    public BigDecimal getDefaultRate() {
-        return defaultRate;
-    }
-
-    public void setDefaultRate(BigDecimal defaultRate) {
-        this.defaultRate = defaultRate;
-    }
-
-    public BigDecimal getCustomRate() {
-        return customRate;
-    }
-
-    public void setCustomRate(BigDecimal customRate) {
-        this.customRate = customRate;
-    }
-
-    public Long getWeightSettingSign() {
-        return weightSettingSign;
-    }
-
-    public void setWeightSettingSign(Long weightSettingSign) {
-        this.weightSettingSign = weightSettingSign;
-    }
-
-    public Long getDimensionSign() {
-        return dimensionSign;
-    }
-
-    public void setDimensionSign(Long dimensionSign) {
-        this.dimensionSign = dimensionSign;
-    }
-
-    public List<CourseWeightDto> getSubmitForm() {
-        return submitForm;
-    }
-
-    public void setSubmitForm(List<CourseWeightDto> submitForm) {
-        this.submitForm = submitForm;
-    }
-}

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/result/FinalScoreResult.java

@@ -1,118 +0,0 @@
-package com.qmth.distributed.print.business.bean.result;
-
-import com.qmth.distributed.print.business.bean.dto.report.ReportExamStudentFinalScoreDto;
-import com.qmth.distributed.print.business.bean.dto.report.ReportExamStudentUsualScoreDto;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.io.Serializable;
-import java.util.LinkedHashMap;
-import java.util.Map;
-
-/**
- * @Description: 期末成绩dto
- * @Param:
- * @return:
- * @Author: wangliang
- * @Date: 2024/2/29
- */
-public class FinalScoreResult implements Serializable {
-
-    @ApiModelProperty(value = "考生名称")
-    private String name;
-
-    @ApiModelProperty(value = "学号")
-    private String studentCode;
-
-    @ApiModelProperty(value = "教学班级")
-    private String administrativeClass;
-
-    @ApiModelProperty(value = "期末考试分数")
-    private Map<Long, Double> finalScoreDimension = new LinkedHashMap<>();
-
-    @ApiModelProperty(value = "期末考试分数")
-    private Map<Long, Double> finalScoreTarget = new LinkedHashMap<>();
-
-    @ApiModelProperty(value = "期末考试分数明细")
-    private String finalScoreDetail;
-
-    @ApiModelProperty(value = "平时作业成绩")
-    private String usualScore;
-
-    @ApiModelProperty(value = "期末成绩集合")
-    private ReportExamStudentFinalScoreDto finalScoreDto;
-
-    @ApiModelProperty(value = "平时成绩集合")
-    private ReportExamStudentUsualScoreDto usualScoreDto;
-
-    public String getAdministrativeClass() {
-        return administrativeClass;
-    }
-
-    public void setAdministrativeClass(String administrativeClass) {
-        this.administrativeClass = administrativeClass;
-    }
-
-    public String getFinalScoreDetail() {
-        return finalScoreDetail;
-    }
-
-    public void setFinalScoreDetail(String finalScoreDetail) {
-        this.finalScoreDetail = finalScoreDetail;
-    }
-
-    public ReportExamStudentFinalScoreDto getFinalScoreDto() {
-        return finalScoreDto;
-    }
-
-    public void setFinalScoreDto(ReportExamStudentFinalScoreDto finalScoreDto) {
-        this.finalScoreDto = finalScoreDto;
-    }
-
-    public ReportExamStudentUsualScoreDto getUsualScoreDto() {
-        return usualScoreDto;
-    }
-
-    public void setUsualScoreDto(ReportExamStudentUsualScoreDto usualScoreDto) {
-        this.usualScoreDto = usualScoreDto;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getStudentCode() {
-        return studentCode;
-    }
-
-    public void setStudentCode(String studentCode) {
-        this.studentCode = studentCode;
-    }
-
-    public Map<Long, Double> getFinalScoreDimension() {
-        return finalScoreDimension;
-    }
-
-    public void setFinalScoreDimension(Map<Long, Double> finalScoreDimension) {
-        this.finalScoreDimension = finalScoreDimension;
-    }
-
-    public Map<Long, Double> getFinalScoreTarget() {
-        return finalScoreTarget;
-    }
-
-    public void setFinalScoreTarget(Map<Long, Double> finalScoreTarget) {
-        this.finalScoreTarget = finalScoreTarget;
-    }
-
-    public String getUsualScore() {
-        return usualScore;
-    }
-
-    public void setUsualScore(String usualScore) {
-        this.usualScore = usualScore;
-    }
-}

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/result/report/PaperStructDimensionResult.java

@@ -1,105 +0,0 @@
-package com.qmth.distributed.print.business.bean.result.report;
-
-import com.qmth.distributed.print.business.bean.dto.report.CourseTargetWebDto;
-import io.swagger.annotations.ApiModelProperty;
-import org.hibernate.validator.constraints.Range;
-
-import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @Description: 试卷蓝图result
- * @Param:
- * @return:
- * @Author: wangliang
- * @Date: 2024/2/19
- */
-public class PaperStructDimensionResult implements Serializable {
-
-    @ApiModelProperty(value = "大题号")
-    @NotNull(message = "大题号不能为空")
-    @Range(min = 1L, message = "大题号最小为1")
-    private Integer mainNumber;
-
-    @ApiModelProperty(value = "小题号")
-    @NotNull(message = "小题号不能为空")
-    @Range(min = 1L, message = "小题号最小为1")
-    private Integer subNumber;
-
-    @ApiModelProperty(value = "试卷编码")
-    private String paperNumber;
-
-    @ApiModelProperty(value = "分数")
-    @NotNull(message = "分数不能为空")
-    private Double score;
-
-    @ApiModelProperty(value = "课程目标名称")
-    @NotNull(message = "课程目标名称不能为空")
-    private String courseTargetName;
-
-    @ApiModelProperty(value = "课程目标集合")
-    @NotEmpty(message = "课程目标集合不能为空")
-    private List<CourseTargetWebDto> targetList = new ArrayList<>();
-
-    public PaperStructDimensionResult() {
-
-    }
-
-    public PaperStructDimensionResult(Integer mainNumber, Integer subNumber, String paperNumber, Double score) {
-        this.mainNumber = mainNumber;
-        this.subNumber = subNumber;
-        this.paperNumber = paperNumber;
-        this.score = score;
-    }
-
-    public String getPaperNumber() {
-        return paperNumber;
-    }
-
-    public void setPaperNumber(String paperNumber) {
-        this.paperNumber = paperNumber;
-    }
-
-    public String getCourseTargetName() {
-        return courseTargetName;
-    }
-
-    public void setCourseTargetName(String courseTargetName) {
-        this.courseTargetName = courseTargetName;
-    }
-
-    public Integer getMainNumber() {
-        return mainNumber;
-    }
-
-    public void setMainNumber(Integer mainNumber) {
-        this.mainNumber = mainNumber;
-    }
-
-    public Integer getSubNumber() {
-        return subNumber;
-    }
-
-    public void setSubNumber(Integer subNumber) {
-        this.subNumber = subNumber;
-    }
-
-    public Double getScore() {
-        return score;
-    }
-
-    public void setScore(Double score) {
-        this.score = score;
-    }
-
-    public List<CourseTargetWebDto> getTargetList() {
-        return targetList;
-    }
-
-    public void setTargetList(List<CourseTargetWebDto> targetList) {
-        this.targetList = targetList;
-    }
-}

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/result/report/ReportChangeResult.java

@@ -1,81 +0,0 @@
-package com.qmth.distributed.print.business.bean.result.report;
-
-import io.swagger.annotations.ApiModelProperty;
-
-import java.io.Serializable;
-
-/**
- * @Description: 报告是否发生变化result
- * @Param:
- * @return:
- * @Author: wangliang
- * @Date: 2024/3/15
- */
-public class ReportChangeResult implements Serializable {
-
-    @ApiModelProperty(value = "课程目标是否发生变化")
-    private boolean courseTargetChange;
-
-    @ApiModelProperty(value = "评价方式是否发生变化")
-    private boolean evaluationChange;
-
-    @ApiModelProperty(value = "知识点是否发生变化")
-    private boolean dimensionChange;
-
-    @ApiModelProperty(value = "权重是否发生变化")
-    private boolean weightChange;
-
-    @ApiModelProperty(value = "目标分是否发生变化")
-    private boolean targetScoreChange;
-
-    @ApiModelProperty(value = "目标分内容")
-    private String targetScoreChangeStr;
-
-    public boolean isTargetScoreChange() {
-        return targetScoreChange;
-    }
-
-    public void setTargetScoreChange(boolean targetScoreChange) {
-        this.targetScoreChange = targetScoreChange;
-    }
-
-    public String getTargetScoreChangeStr() {
-        return targetScoreChangeStr;
-    }
-
-    public void setTargetScoreChangeStr(String targetScoreChangeStr) {
-        this.targetScoreChangeStr = targetScoreChangeStr;
-    }
-
-    public boolean isCourseTargetChange() {
-        return courseTargetChange;
-    }
-
-    public void setCourseTargetChange(boolean courseTargetChange) {
-        this.courseTargetChange = courseTargetChange;
-    }
-
-    public boolean isEvaluationChange() {
-        return evaluationChange;
-    }
-
-    public void setEvaluationChange(boolean evaluationChange) {
-        this.evaluationChange = evaluationChange;
-    }
-
-    public boolean isDimensionChange() {
-        return dimensionChange;
-    }
-
-    public void setDimensionChange(boolean dimensionChange) {
-        this.dimensionChange = dimensionChange;
-    }
-
-    public boolean isWeightChange() {
-        return weightChange;
-    }
-
-    public void setWeightChange(boolean weightChange) {
-        this.weightChange = weightChange;
-    }
-}

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/result/report/ReportResult.java

@@ -1,90 +0,0 @@
-package com.qmth.distributed.print.business.bean.result.report;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.qmth.distributed.print.business.bean.dto.report.*;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.io.Serializable;
-
-/**
- * @Description: 报告result
- * @Param:
- * @return:
- * @Author: wangliang
- * @Date: 2024/2/19
- */
-public class ReportResult implements Serializable {
-
-    @ApiModelProperty(value = "公共信息")
-    @TableField(exist = false)
-    private ReportCommonDto commonInfo;
-
-    @ApiModelProperty(value = "课程基本情况")
-    @TableField(exist = false)
-    private ReportCourseBasicInfoDto courseBasicInfo;
-
-    @ApiModelProperty(value = "课程目标考核分布")
-    @TableField(exist = false)
-    private ReportCourseEvaluationSpreadDto courseEvaluationSpreadInfo;
-
-    @ApiModelProperty(value = "课程考核成绩评价结果")
-    @TableField(exist = false)
-    private ReportCourseEvaluationResultDto courseEvaluationResultInfo;
-
-    @ApiModelProperty(value = "课程目标达成评价明细结果")
-    @TableField(exist = false)
-    private ReportCourseEvaluationResultDetailDto courseEvaluationResultDetailInfo;
-
-    public ReportResult() {
-
-    }
-
-    public ReportResult(ReportCommonDto commonInfo, ReportCourseBasicInfoDto courseBasicInfo, ReportCourseEvaluationSpreadDto courseEvaluationSpreadInfo
-            , ReportCourseEvaluationResultDto courseEvaluationResultInfo, ReportCourseEvaluationResultDetailDto courseEvaluationResultDetailInfo) {
-        this.commonInfo = commonInfo;
-        this.courseBasicInfo = courseBasicInfo;
-        this.courseEvaluationSpreadInfo = courseEvaluationSpreadInfo;
-        this.courseEvaluationResultInfo = courseEvaluationResultInfo;
-        this.courseEvaluationResultDetailInfo = courseEvaluationResultDetailInfo;
-    }
-
-    public ReportCommonDto getCommonInfo() {
-        return commonInfo;
-    }
-
-    public void setCommonInfo(ReportCommonDto commonInfo) {
-        this.commonInfo = commonInfo;
-    }
-
-    public ReportCourseBasicInfoDto getCourseBasicInfo() {
-        return courseBasicInfo;
-    }
-
-    public void setCourseBasicInfo(ReportCourseBasicInfoDto courseBasicInfo) {
-        this.courseBasicInfo = courseBasicInfo;
-    }
-
-    public ReportCourseEvaluationSpreadDto getCourseEvaluationSpreadInfo() {
-        return courseEvaluationSpreadInfo;
-    }
-
-    public void setCourseEvaluationSpreadInfo(ReportCourseEvaluationSpreadDto courseEvaluationSpreadInfo) {
-        this.courseEvaluationSpreadInfo = courseEvaluationSpreadInfo;
-    }
-
-    public ReportCourseEvaluationResultDto getCourseEvaluationResultInfo() {
-        return courseEvaluationResultInfo;
-    }
-
-    public void setCourseEvaluationResultInfo(ReportCourseEvaluationResultDto courseEvaluationResultInfo) {
-        this.courseEvaluationResultInfo = courseEvaluationResultInfo;
-    }
-
-    public ReportCourseEvaluationResultDetailDto getCourseEvaluationResultDetailInfo() {
-        return courseEvaluationResultDetailInfo;
-    }
-
-    public void setCourseEvaluationResultDetailInfo(ReportCourseEvaluationResultDetailDto courseEvaluationResultDetailInfo) {
-        this.courseEvaluationResultDetailInfo = courseEvaluationResultDetailInfo;
-    }
-}

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/result/report/word/CourseBasicBean.java

@@ -1,178 +0,0 @@
-package com.qmth.distributed.print.business.bean.result.report.word;
-
-import io.swagger.annotations.ApiModelProperty;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-
-/**
- * @Description: 课程基本信息bean
- * @Param:
- * @return:
- * @Author: wangliang
- * @Date: 2024/1/31
- */
-public class CourseBasicBean implements Serializable {
-
-    @ApiModelProperty(name = "课程名称")
-    String courseName;
-
-    @ApiModelProperty(name = "课程编码")
-    String courseCode;
-
-    @ApiModelProperty(name = "课程英文名称")
-    String courseEnName;
-
-    @ApiModelProperty(name = "课程性质")
-    String courseType;
-
-    @ApiModelProperty(name = "总学时/学分")
-    String credit;
-
-    @ApiModelProperty(name = "理论/实验")
-    String theory;
-
-    @ApiModelProperty(name = "评价样本范围")
-    String sampleRange;
-
-    @ApiModelProperty(name = "评价人")
-    String people;
-
-    @ApiModelProperty(name = "评价时间")
-    String date;
-
-    @ApiModelProperty(name = "课程目标")
-    String courseTarget;
-
-    @ApiModelProperty(name = "课程目标数")
-    Integer courseTargetNum;
-
-    @ApiModelProperty(name = "平时作业权重")
-    BigDecimal usualScoreWeight;
-
-    @ApiModelProperty(name = "期末考试权重")
-    BigDecimal finalScoreWeight;
-
-    public CourseBasicBean() {
-
-    }
-
-    public CourseBasicBean(String courseName, String courseCode, String courseEnName, String courseType, String credit
-            , String theory, String sampleRange, String people, String date, String courseTarget, Integer courseTargetNum) {
-        this.courseName = courseName;
-        this.courseCode = courseCode;
-        this.courseEnName = courseEnName;
-        this.courseType = courseType;
-        this.credit = credit;
-        this.theory = theory;
-        this.sampleRange = sampleRange;
-        this.people = people;
-        this.date = date;
-        this.courseTarget = courseTarget;
-        this.courseTargetNum = courseTargetNum;
-    }
-
-    public BigDecimal getUsualScoreWeight() {
-        return usualScoreWeight;
-    }
-
-    public void setUsualScoreWeight(BigDecimal usualScoreWeight) {
-        this.usualScoreWeight = usualScoreWeight;
-    }
-
-    public BigDecimal getFinalScoreWeight() {
-        return finalScoreWeight;
-    }
-
-    public void setFinalScoreWeight(BigDecimal finalScoreWeight) {
-        this.finalScoreWeight = finalScoreWeight;
-    }
-
-    public String getCourseTarget() {
-        return courseTarget;
-    }
-
-    public void setCourseTarget(String courseTarget) {
-        this.courseTarget = courseTarget;
-    }
-
-    public Integer getCourseTargetNum() {
-        return courseTargetNum;
-    }
-
-    public void setCourseTargetNum(Integer courseTargetNum) {
-        this.courseTargetNum = courseTargetNum;
-    }
-
-    public String getCourseName() {
-        return courseName;
-    }
-
-    public void setCourseName(String courseName) {
-        this.courseName = courseName;
-    }
-
-    public String getCourseCode() {
-        return courseCode;
-    }
-
-    public void setCourseCode(String courseCode) {
-        this.courseCode = courseCode;
-    }
-
-    public String getCourseEnName() {
-        return courseEnName;
-    }
-
-    public void setCourseEnName(String courseEnName) {
-        this.courseEnName = courseEnName;
-    }
-
-    public String getCourseType() {
-        return courseType;
-    }
-
-    public void setCourseType(String courseType) {
-        this.courseType = courseType;
-    }
-
-    public String getCredit() {
-        return credit;
-    }
-
-    public void setCredit(String credit) {
-        this.credit = credit;
-    }
-
-    public String getTheory() {
-        return theory;
-    }
-
-    public void setTheory(String theory) {
-        this.theory = theory;
-    }
-
-    public String getSampleRange() {
-        return sampleRange;
-    }
-
-    public void setSampleRange(String sampleRange) {
-        this.sampleRange = sampleRange;
-    }
-
-    public String getPeople() {
-        return people;
-    }
-
-    public void setPeople(String people) {
-        this.people = people;
-    }
-
-    public String getDate() {
-        return date;
-    }
-
-    public void setDate(String date) {
-        this.date = date;
-    }
-}

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/result/report/word/CourseReportBean.java

@@ -1,124 +0,0 @@
-package com.qmth.distributed.print.business.bean.result.report.word;
-
-import com.deepoove.poi.data.TableRenderData;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.io.Serializable;
-
-/**
- * @Description: 课程报告bean
- * @Param:
- * @return:
- * @Author: wangliang
- * @Date: 2024/1/31
- */
-public class CourseReportBean implements Serializable {
-
-    @ApiModelProperty(name = "标题1")
-    String title1;
-
-    @ApiModelProperty(name = "考生标题1")
-    String examStudentTitle1;
-
-    @ApiModelProperty(name = "考生标题2")
-    String examStudentTitle2;
-
-    @ApiModelProperty(name = "课程bean")
-    CourseBasicBean courseBasicBean;
-
-    @ApiModelProperty(name = "课程报告表格1bean-课程目标与毕业要求指标点的对应关系")
-    TableRenderData courseTargetTable1;
-
-    @ApiModelProperty(name = "课程报告表格2bean-课程目标达成考核/评价环节及目标分值")
-    TableRenderData courseTargetTable2;
-
-    @ApiModelProperty(name = "课程报告表格3bean-课程课后作业考核/评价内容及目标分值")
-    TableRenderData courseTargetTable3;
-
-    @ApiModelProperty(name = "课程报告表格4bean-课程期末考试考核/评价内容及目标分值")
-    TableRenderData courseTargetTable4;
-
-    @ApiModelProperty(name = "考生表格1bean")
-    TableRenderData examStudentTable1;
-
-    public CourseReportBean() {
-
-    }
-
-    public CourseReportBean(String title1, CourseBasicBean courseBasicBean) {
-        this.title1 = title1;
-        this.courseBasicBean = courseBasicBean;
-    }
-
-    public TableRenderData getExamStudentTable1() {
-        return examStudentTable1;
-    }
-
-    public void setExamStudentTable1(TableRenderData examStudentTable1) {
-        this.examStudentTable1 = examStudentTable1;
-    }
-
-    public TableRenderData getCourseTargetTable3() {
-        return courseTargetTable3;
-    }
-
-    public void setCourseTargetTable3(TableRenderData courseTargetTable3) {
-        this.courseTargetTable3 = courseTargetTable3;
-    }
-
-    public TableRenderData getCourseTargetTable4() {
-        return courseTargetTable4;
-    }
-
-    public void setCourseTargetTable4(TableRenderData courseTargetTable4) {
-        this.courseTargetTable4 = courseTargetTable4;
-    }
-
-    public String getExamStudentTitle1() {
-        return examStudentTitle1;
-    }
-
-    public void setExamStudentTitle1(String examStudentTitle1) {
-        this.examStudentTitle1 = examStudentTitle1;
-    }
-
-    public String getExamStudentTitle2() {
-        return examStudentTitle2;
-    }
-
-    public void setExamStudentTitle2(String examStudentTitle2) {
-        this.examStudentTitle2 = examStudentTitle2;
-    }
-
-    public String getTitle1() {
-        return title1;
-    }
-
-    public void setTitle1(String title1) {
-        this.title1 = title1;
-    }
-
-    public CourseBasicBean getCourseBasicBean() {
-        return courseBasicBean;
-    }
-
-    public void setCourseBasicBean(CourseBasicBean courseBasicBean) {
-        this.courseBasicBean = courseBasicBean;
-    }
-
-    public TableRenderData getCourseTargetTable1() {
-        return courseTargetTable1;
-    }
-
-    public void setCourseTargetTable1(TableRenderData courseTargetTable1) {
-        this.courseTargetTable1 = courseTargetTable1;
-    }
-
-    public TableRenderData getCourseTargetTable2() {
-        return courseTargetTable2;
-    }
-
-    public void setCourseTargetTable2(TableRenderData courseTargetTable2) {
-        this.courseTargetTable2 = courseTargetTable2;
-    }
-}

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/result/report/word/CourseTargetTableBean3.java

@@ -1,83 +0,0 @@
-package com.qmth.distributed.print.business.bean.result.report.word;
-
-import io.swagger.annotations.ApiModelProperty;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-
-/**
- * @Description: 课程报告表格3bean
- * @Param:
- * @return:
- * @Author: wangliang
- * @Date: 2024/1/31
- */
-public class CourseTargetTableBean3 implements Serializable {
-
-    @ApiModelProperty(name = "序号")
-    Integer num = 0;
-
-    @ApiModelProperty(name = "项目")
-    String project;
-
-    @ApiModelProperty(name = "考核内容及要求")
-    String content;
-
-    @ApiModelProperty(name = "目标分值")
-    BigDecimal target;
-
-    @ApiModelProperty(name = "对应的课程目标")
-    String courseTarget;
-
-    public CourseTargetTableBean3() {
-
-    }
-
-    public CourseTargetTableBean3(Integer num, String project, String content, BigDecimal target, String courseTarget) {
-        this.num = num;
-        this.project = project;
-        this.content = content;
-        this.target = target;
-        this.courseTarget = courseTarget;
-    }
-
-    public Integer getNum() {
-        return num;
-    }
-
-    public void setNum(Integer num) {
-        this.num = num;
-    }
-
-    public String getProject() {
-        return project;
-    }
-
-    public void setProject(String project) {
-        this.project = project;
-    }
-
-    public String getContent() {
-        return content;
-    }
-
-    public void setContent(String content) {
-        this.content = content;
-    }
-
-    public BigDecimal getTarget() {
-        return target;
-    }
-
-    public void setTarget(BigDecimal target) {
-        this.target = target;
-    }
-
-    public String getCourseTarget() {
-        return courseTarget;
-    }
-
-    public void setCourseTarget(String courseTarget) {
-        this.courseTarget = courseTarget;
-    }
-}

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/result/report/word/CourseTargetTableBean4.java

@@ -1,83 +0,0 @@
-package com.qmth.distributed.print.business.bean.result.report.word;
-
-import io.swagger.annotations.ApiModelProperty;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-
-/**
- * @Description: 课程报告表格4bean
- * @Param:
- * @return:
- * @Author: wangliang
- * @Date: 2024/1/31
- */
-public class CourseTargetTableBean4 implements Serializable {
-
-    @ApiModelProperty(name = "序号")
-    Integer num = 0;
-
-    @ApiModelProperty(name = "考核项目")
-    String project;
-
-    @ApiModelProperty(name = "考核内容所涵盖的知识单元")
-    String content;
-
-    @ApiModelProperty(name = "目标分值")
-    Double targetScore;
-
-    @ApiModelProperty(name = "对应的课程目标")
-    String courseTarget;
-
-    public CourseTargetTableBean4() {
-
-    }
-
-    public CourseTargetTableBean4(Integer num, String project, String content, Double targetScore, String courseTarget) {
-        this.num = num;
-        this.project = project;
-        this.content = content;
-        this.targetScore = targetScore;
-        this.courseTarget = courseTarget;
-    }
-
-    public Integer getNum() {
-        return num;
-    }
-
-    public void setNum(Integer num) {
-        this.num = num;
-    }
-
-    public String getProject() {
-        return project;
-    }
-
-    public void setProject(String project) {
-        this.project = project;
-    }
-
-    public String getContent() {
-        return content;
-    }
-
-    public void setContent(String content) {
-        this.content = content;
-    }
-
-    public Double getTargetScore() {
-        return targetScore;
-    }
-
-    public void setTargetScore(Double targetScore) {
-        this.targetScore = targetScore;
-    }
-
-    public String getCourseTarget() {
-        return courseTarget;
-    }
-
-    public void setCourseTarget(String courseTarget) {
-        this.courseTarget = courseTarget;
-    }
-}

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

@@ -1,93 +0,0 @@
-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.teachcloud.common.base.BaseEntity;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 专业认证课程
- * </p>
- *
- * @author xf
- * @since 2024-04-22
- */
-@TableName("t_p_course")
-@ApiModel(value = "TPCourse对象", description = "专业认证课程")
-public class TPCourse extends BaseEntity implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "专业ID")
-    private Long professionalId;
-
-    @ApiModelProperty(value = "课程ID")
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long courseId;
-
-    @ApiModelProperty(value = "课程代码")
-    private String courseCode;
-
-    @ApiModelProperty(value = "课程名称")
-    private String courseName;
-
-    @ApiModelProperty(value = "排序值")
-    private Integer sortNum;
-
-    public Long getProfessionalId() {
-        return professionalId;
-    }
-
-    public void setProfessionalId(Long professionalId) {
-        this.professionalId = professionalId;
-    }
-
-    public Long getCourseId() {
-        return courseId;
-    }
-
-    public void setCourseId(Long courseId) {
-        this.courseId = courseId;
-    }
-
-    public String getCourseCode() {
-        return courseCode;
-    }
-
-    public void setCourseCode(String courseCode) {
-        this.courseCode = courseCode;
-    }
-
-    public String getCourseName() {
-        return courseName;
-    }
-
-    public void setCourseName(String courseName) {
-        this.courseName = courseName;
-    }
-
-    public Integer getSortNum() {
-        return sortNum;
-    }
-
-    public void setSortNum(Integer sortNum) {
-        this.sortNum = sortNum;
-    }
-
-    @Override
-    public String toString() {
-        return "TPCourse{" +
-                ", professionalId=" + professionalId +
-                ", courseCode=" + courseCode +
-                ", courseName=" + courseName +
-                ", sortNum=" + sortNum +
-                "}";
-    }
-}

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

@@ -1,114 +0,0 @@
-package com.qmth.distributed.print.business.entity;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.qmth.teachcloud.common.base.BaseEntity;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 专业认证毕业要求支撑矩阵
- * </p>
- *
- * @author xf
- * @since 2024-04-22
- */
-@TableName("t_p_matrix")
-@ApiModel(value = "TPMatrix对象", description = "专业认证毕业要求支撑矩阵")
-public class TPMatrix extends BaseEntity implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "专业ID")
-    private Long professionalId;
-
-    @ApiModelProperty(value = "专业认证课程ID")
-    private Long courseId;
-
-    @ApiModelProperty(value = "专业认证毕业要求ID")
-    private Long requirementId;
-
-    @ApiModelProperty(value = "子节点名称")
-    private String subName;
-
-    @ApiModelProperty(value = "指标值")
-    private Double content;
-
-    @ApiModelProperty(value = "课程排序值")
-    @TableField(exist = false)
-    private int courseSortNum;
-
-    @ApiModelProperty(value = "毕业要求排序值")
-    @TableField(exist = false)
-    private int requirementSortNum;
-
-    public Long getProfessionalId() {
-        return professionalId;
-    }
-
-    public void setProfessionalId(Long professionalId) {
-        this.professionalId = professionalId;
-    }
-
-    public Long getCourseId() {
-        return courseId;
-    }
-
-    public void setCourseId(Long courseId) {
-        this.courseId = courseId;
-    }
-
-    public Long getRequirementId() {
-        return requirementId;
-    }
-
-    public void setRequirementId(Long requirementId) {
-        this.requirementId = requirementId;
-    }
-
-    public String getSubName() {
-        return subName;
-    }
-
-    public void setSubName(String subName) {
-        this.subName = subName;
-    }
-
-    public Double getContent() {
-        return content;
-    }
-
-    public void setContent(Double content) {
-        this.content = content;
-    }
-
-    public int getCourseSortNum() {
-        return courseSortNum;
-    }
-
-    public void setCourseSortNum(int courseSortNum) {
-        this.courseSortNum = courseSortNum;
-    }
-
-    public int getRequirementSortNum() {
-        return requirementSortNum;
-    }
-
-    public void setRequirementSortNum(int requirementSortNum) {
-        this.requirementSortNum = requirementSortNum;
-    }
-
-    @Override
-    public String toString() {
-        return "TPMatrix{" +
-                ", professionalId=" + professionalId +
-                ", courseId=" + courseId +
-                ", requirementId=" + requirementId +
-                ", subName=" + subName +
-                ", content=" + content +
-                "}";
-    }
-}

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

@@ -1,76 +0,0 @@
-package com.qmth.distributed.print.business.entity;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.io.Serializable;
-
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.qmth.teachcloud.common.base.BaseEntity;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-import javax.validation.constraints.Max;
-import javax.validation.constraints.Min;
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-
-/**
- * <p>
- * 专业认证专业表
- * </p>
- *
- * @author xf
- * @since 2024-04-22
- */
-@TableName("t_p_professional")
-@ApiModel(value="TPProfessional对象", description="专业认证专业表")
-public class TPProfessional extends BaseEntity implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @JsonSerialize(using = ToStringSerializer.class)
-    @ApiModelProperty(value = "学校ID")
-    private Long schoolId;
-
-    @NotBlank(message = "专业名称不能为空")
-    @ApiModelProperty(value = "专业名称")
-    private String name;
-
-    @JsonSerialize(using = ToStringSerializer.class)
-    @NotNull(message = "所属学院ID不能为空")
-    @ApiModelProperty(value = "所属学院ID")
-    private Long orgId;
-
-    public Long getSchoolId() {
-        return schoolId;
-    }
-
-    public void setSchoolId(Long schoolId) {
-        this.schoolId = schoolId;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-    public Long getOrgId() {
-        return orgId;
-    }
-
-    public void setOrgId(Long orgId) {
-        this.orgId = orgId;
-    }
-
-    @Override
-    public String toString() {
-        return "TPProfessional{" +
-            ", name=" + name +
-            ", orgId=" + orgId +
-        "}";
-    }
-}

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

@@ -1,89 +0,0 @@
-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.qmth.teachcloud.common.base.BaseEntity;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 专业认证毕业要求
- * </p>
- *
- * @author xf
- * @since 2024-04-22
- */
-@TableName("t_p_requirement")
-@ApiModel(value = "TPRequirement对象", description = "专业认证毕业要求")
-public class TPRequirement extends BaseEntity implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "专业ID")
-    private Long professionalId;
-    @ApiModelProperty(value = "毕业要求Code")
-    private String code;
-    @ApiModelProperty(value = "毕业要求")
-    private String name;
-
-    @ApiModelProperty(value = "节点数量")
-    @TableField(updateStrategy = FieldStrategy.IGNORED)
-    private Integer nodeCount;
-
-    @ApiModelProperty(value = "排序值")
-    private Integer sortNum;
-
-    public Long getProfessionalId() {
-        return professionalId;
-    }
-
-    public void setProfessionalId(Long professionalId) {
-        this.professionalId = professionalId;
-    }
-
-    public String getCode() {
-        return code;
-    }
-
-    public void setCode(String code) {
-        this.code = code;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public Integer getNodeCount() {
-        return nodeCount;
-    }
-
-    public void setNodeCount(Integer nodeCount) {
-        this.nodeCount = nodeCount;
-    }
-
-    public Integer getSortNum() {
-        return sortNum;
-    }
-
-    public void setSortNum(Integer sortNum) {
-        this.sortNum = sortNum;
-    }
-
-    @Override
-    public String toString() {
-        return "TPRequirement{" +
-                ", professionalId=" + professionalId +
-                ", name=" + name +
-                ", nodeCount=" + nodeCount +
-                ", sortNum=" + sortNum +
-                "}";
-    }
-}

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

@@ -1,347 +0,0 @@
-package com.qmth.distributed.print.business.entity;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.qmth.distributed.print.business.bean.result.report.ReportResult;
-import com.qmth.teachcloud.common.base.BaseEntity;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-import javax.validation.constraints.NotNull;
-import java.io.Serializable;
-
-/**
- * <p>
- * 报告基本情况表
- * </p>
- *
- * @author wangliang
- * @since 2024-02-18
- */
-@ApiModel(value = "TRBasicInfo对象", description = "报告基本情况表")
-public class TRBasicInfo extends BaseEntity implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "考试id")
-    @JsonSerialize(using = ToStringSerializer.class)
-    @NotNull(message = "考试id不能为空")
-    private Long examId;
-    @ApiModelProperty(value = "课程id")
-    @NotNull(message = "课程ID不能为空")
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long courseId;
-    @ApiModelProperty(value = "课程编码")
-    private String courseCode;
-
-    @ApiModelProperty(value = "课程名称")
-    @NotNull(message = "课程名称不能为空")
-    private String courseName;
-
-    @ApiModelProperty(value = "试卷编码")
-    private String paperNumber;
-
-    @ApiModelProperty(value = "课程性质")
-    private String courseType;
-
-    @ApiModelProperty(value = "学分")
-    private String credit;
-
-    @ApiModelProperty(value = "学时")
-    private String period;
-
-    @ApiModelProperty(value = "考核方式")
-    private String evaluationMode;
-
-    @ApiModelProperty(value = "开课时间")
-    private String openTime;
-
-    @ApiModelProperty(value = "授课对象")
-    private String teachingObject;
-
-    @ApiModelProperty(value = "选课人数")
-    private Integer selectionCount;
-
-    @ApiModelProperty(value = "参评人数")
-    private Integer participantCount = 0;
-
-    @ApiModelProperty(value = "课程目标达成度期望值")
-    private Double courseDegree;
-
-    @ApiModelProperty(value = "任课老师")
-    private String teacher;
-
-    @ApiModelProperty(value = "评价责任人")
-    private String director;
-
-    @ApiModelProperty(value = "评价参与人")
-    private String participant;
-
-    @ApiModelProperty(value = "是否启用，0：停用，1：启用")
-    private Boolean enable;
-
-    @ApiModelProperty(value = "课程目标考核分布")
-    private String courseEvaluationSpread;
-
-    @ApiModelProperty(value = "课程考核成绩评价结果")
-    private String courseEvaluationResult;
-
-    @ApiModelProperty(value = "课程考核成绩评价明细结果")
-    private String courseEvaluationResultDetail;
-
-    @ApiModelProperty(value = "报告信息")
-    @TableField(exist = false)
-    private ReportResult reportResult;
-
-    @JsonSerialize(using = ToStringSerializer.class)
-    @ApiModelProperty(value = "教学课程id")
-    private Long teachCourseId;
-
-    public TRBasicInfo() {
-
-    }
-
-    public TRBasicInfo(Long examId, Long courseId, String paperNumber, Long teachCourseId, String openTime, String teachingObject, String teacher, Integer participantCount, Long userId) {
-        insertInfo(userId);
-        this.examId = examId;
-        this.courseId = courseId;
-        this.paperNumber = paperNumber;
-        this.teachCourseId = teachCourseId;
-        this.openTime = openTime;
-        this.teachingObject = teachingObject;
-        this.teacher = teacher;
-        this.participantCount = participantCount;
-        this.enable = true;
-        this.reportResult = new ReportResult();
-    }
-
-    public TRBasicInfo(TRBasicInfo trBasicInfo, Long userId) {
-        insertInfo(userId);
-        this.setValue(trBasicInfo);
-        this.enable = true;
-    }
-
-    public void updateInfo(TRBasicInfo trBasicInfo, Long userId) {
-        this.setValue(trBasicInfo);
-        updateInfo(userId);
-    }
-
-    protected void setValue(TRBasicInfo trBasicInfo) {
-        this.examId = trBasicInfo.getExamId();
-        this.courseId = trBasicInfo.getCourseId();
-        this.paperNumber = trBasicInfo.getPaperNumber();
-        this.teachCourseId = trBasicInfo.getTeachCourseId();
-        this.courseType = trBasicInfo.getCourseType();
-        this.credit = trBasicInfo.getCredit();
-        this.period = trBasicInfo.getPeriod();
-        this.evaluationMode = trBasicInfo.getEvaluationMode();
-        this.openTime = trBasicInfo.getOpenTime();
-        this.teachingObject = trBasicInfo.getTeachingObject();
-        this.selectionCount = trBasicInfo.getSelectionCount();
-        this.participantCount = trBasicInfo.getParticipantCount();
-        this.courseDegree = trBasicInfo.getCourseDegree();
-        this.teacher = trBasicInfo.getTeacher();
-        this.director = trBasicInfo.getDirector();
-        this.participant = trBasicInfo.getParticipant();
-        this.courseEvaluationSpread = trBasicInfo.getCourseEvaluationSpread();
-        this.courseEvaluationResult = trBasicInfo.getCourseEvaluationResult();
-        this.courseEvaluationResultDetail = trBasicInfo.getCourseEvaluationResultDetail();
-    }
-
-    public void setBasicInfo(Long examId, Long courseId, String paperNumber, String openTime, String teachingObject, String teacher, Integer participantCount) {
-        this.examId = examId;
-        this.courseId = courseId;
-        this.paperNumber = paperNumber;
-        this.openTime = openTime;
-        this.teachingObject = teachingObject;
-        this.teacher = teacher;
-        this.participantCount = participantCount;
-        this.enable = true;
-        this.reportResult = new ReportResult();
-    }
-
-    public Long getCourseId() {
-        return courseId;
-    }
-
-    public void setCourseId(Long courseId) {
-        this.courseId = courseId;
-    }
-
-    public Long getTeachCourseId() {
-        return teachCourseId;
-    }
-
-    public void setTeachCourseId(Long teachCourseId) {
-        this.teachCourseId = teachCourseId;
-    }
-
-    public ReportResult getReportResult() {
-        return reportResult;
-    }
-
-    public void setReportResult(ReportResult reportResult) {
-        this.reportResult = reportResult;
-    }
-
-    public String getCredit() {
-        return credit;
-    }
-
-    public void setCredit(String credit) {
-        this.credit = credit;
-    }
-
-    public String getPeriod() {
-        return period;
-    }
-
-    public void setPeriod(String period) {
-        this.period = period;
-    }
-
-    public Long getExamId() {
-        return examId;
-    }
-
-    public void setExamId(Long examId) {
-        this.examId = examId;
-    }
-
-    public String getCourseCode() {
-        return courseCode;
-    }
-
-    public void setCourseCode(String courseCode) {
-        this.courseCode = courseCode;
-    }
-
-    public String getCourseName() {
-        return courseName;
-    }
-
-    public void setCourseName(String courseName) {
-        this.courseName = courseName;
-    }
-
-    public String getPaperNumber() {
-        return paperNumber;
-    }
-
-    public void setPaperNumber(String paperNumber) {
-        this.paperNumber = paperNumber;
-    }
-
-    public String getCourseType() {
-        return courseType;
-    }
-
-    public void setCourseType(String courseType) {
-        this.courseType = courseType;
-    }
-
-    public String getEvaluationMode() {
-        return evaluationMode;
-    }
-
-    public void setEvaluationMode(String evaluationMode) {
-        this.evaluationMode = evaluationMode;
-    }
-
-    public String getOpenTime() {
-        return openTime;
-    }
-
-    public void setOpenTime(String openTime) {
-        this.openTime = openTime;
-    }
-
-    public String getTeachingObject() {
-        return teachingObject;
-    }
-
-    public void setTeachingObject(String teachingObject) {
-        this.teachingObject = teachingObject;
-    }
-
-    public Double getCourseDegree() {
-        return courseDegree;
-    }
-
-    public void setCourseDegree(Double courseDegree) {
-        this.courseDegree = courseDegree;
-    }
-
-    public Integer getSelectionCount() {
-        return selectionCount;
-    }
-
-    public void setSelectionCount(Integer selectionCount) {
-        this.selectionCount = selectionCount;
-    }
-
-    public Integer getParticipantCount() {
-        return participantCount;
-    }
-
-    public void setParticipantCount(Integer participantCount) {
-        this.participantCount = participantCount;
-    }
-
-    public String getTeacher() {
-        return teacher;
-    }
-
-    public void setTeacher(String teacher) {
-        this.teacher = teacher;
-    }
-
-    public String getDirector() {
-        return director;
-    }
-
-    public void setDirector(String director) {
-        this.director = director;
-    }
-
-    public String getParticipant() {
-        return participant;
-    }
-
-    public void setParticipant(String participant) {
-        this.participant = participant;
-    }
-
-    public Boolean getEnable() {
-        return enable;
-    }
-
-    public void setEnable(Boolean enable) {
-        this.enable = enable;
-    }
-
-    public String getCourseEvaluationSpread() {
-        return courseEvaluationSpread;
-    }
-
-    public void setCourseEvaluationSpread(String courseEvaluationSpread) {
-        this.courseEvaluationSpread = courseEvaluationSpread;
-    }
-
-    public String getCourseEvaluationResult() {
-        return courseEvaluationResult;
-    }
-
-    public void setCourseEvaluationResult(String courseEvaluationResult) {
-        this.courseEvaluationResult = courseEvaluationResult;
-    }
-
-    public String getCourseEvaluationResultDetail() {
-        return courseEvaluationResultDetail;
-    }
-
-    public void setCourseEvaluationResultDetail(String courseEvaluationResultDetail) {
-        this.courseEvaluationResultDetail = courseEvaluationResultDetail;
-    }
-}

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

@@ -1,125 +0,0 @@
-package com.qmth.distributed.print.business.entity;
-
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.qmth.distributed.print.business.bean.dto.report.ReportExamStudentDto;
-import com.qmth.teachcloud.common.contant.SystemConstant;
-import com.qmth.teachcloud.common.util.JacksonUtil;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 报告考生表
- * </p>
- *
- * @author wangliang
- * @since 2024-02-18
- */
-@ApiModel(value = "TRExamStudent对象", description = "报告考生表")
-public class TRExamStudent implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "主键")
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long id;
-
-    @ApiModelProperty(value = "报告id")
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long rBasicInfoId;
-
-    @ApiModelProperty(value = "考生姓名")
-    private String name;
-
-    @ApiModelProperty(value = "学号")
-    private String studentCode;
-
-    @ApiModelProperty(value = "行政班级")
-    private String administrativeClass;
-
-    @ApiModelProperty(value = "综合成绩")
-    private Double score;
-
-    @ApiModelProperty(value = "考生课程考核成绩评价明细结果")
-    private String resultDetail;
-
-    public TRExamStudent() {
-
-    }
-
-    public TRExamStudent(Long rBasicInfoId, String name, String studentCode) {
-        this.id = SystemConstant.getDbUuid();
-        this.rBasicInfoId = rBasicInfoId;
-        this.name = name;
-        this.studentCode = studentCode;
-    }
-
-    public TRExamStudent(Long rBasicInfoId, ReportExamStudentDto reportExamStudentDto) {
-        this.id = SystemConstant.getDbUuid();
-        this.rBasicInfoId = rBasicInfoId;
-        this.name = reportExamStudentDto.getName();
-        this.administrativeClass = reportExamStudentDto.getAdministrativeClass();
-        this.studentCode = reportExamStudentDto.getStudentCode();
-        this.score = reportExamStudentDto.getScore();
-        this.resultDetail = JacksonUtil.parseJson(reportExamStudentDto.getTargetList());
-    }
-
-    public Double getScore() {
-        return score;
-    }
-
-    public void setScore(Double score) {
-        this.score = score;
-    }
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Long getrBasicInfoId() {
-        return rBasicInfoId;
-    }
-
-    public void setrBasicInfoId(Long rBasicInfoId) {
-        this.rBasicInfoId = rBasicInfoId;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getStudentCode() {
-        return studentCode;
-    }
-
-    public void setStudentCode(String studentCode) {
-        this.studentCode = studentCode;
-    }
-
-    public String getAdministrativeClass() {
-        return administrativeClass;
-    }
-
-    public void setAdministrativeClass(String administrativeClass) {
-        this.administrativeClass = administrativeClass;
-    }
-
-    public String getResultDetail() {
-        return resultDetail;
-    }
-
-    public void setResultDetail(String resultDetail) {
-        this.resultDetail = resultDetail;
-    }
-}

distributed-print-business/src/main/java/com/qmth/distributed/print/business/enums/CourseDimensionCodeEnum.java

@@ -1,103 +0,0 @@
-package com.qmth.distributed.print.business.enums;
-
-import com.qmth.boot.core.exception.StatusException;
-
-import java.util.Arrays;
-import java.util.List;
-import java.util.stream.Collectors;
-
-/**
- * @Description: 课程知识点编号枚举
- * @Author: CaoZixuan
- * @Date: 2022-10-18
- */
-public enum CourseDimensionCodeEnum {
-    A("A", 1),
-    B("B", 2),
-    C("C", 3),
-    D("D", 4),
-    E("E", 5),
-    F("F", 6),
-    G("G", 7),
-    H("H", 8),
-    I("I", 9),
-    J("J", 10),
-    K("K", 11),
-    L("L", 12),
-    M("M", 13),
-    N("N", 14),
-    O("O", 15),
-    P("P", 16),
-    Q("Q", 17),
-    R("R", 18),
-    S("S", 19),
-    T("T", 20),
-    U("U", 21),
-    V("V", 22),
-    W("W", 23),
-    X("X", 24),
-    Y("Y", 25),
-    Z("Z", 26),
-    a("a", 27),
-    b("b", 28),
-    c("c", 29),
-    d("d", 30),
-    e("e", 31),
-    f("f", 32),
-    g("g", 33),
-    h("h", 34),
-    i("i", 35),
-    j("j", 36),
-    k("k", 37),
-    l("l", 38),
-    m("m", 39),
-    n("n", 40),
-    o("o", 41),
-    p("p", 42),
-    q("q", 43),
-    r("r", 44),
-    s("s", 45),
-    t("t", 46),
-    u("u", 47),
-    v("v", 48),
-    w("w", 49),
-    x("x", 50),
-    y("y", 51),
-    z("z", 52);
-
-    private final String code;
-    private final int index;
-
-    CourseDimensionCodeEnum(String code, int index) {
-        this.code = code;
-        this.index = index;
-    }
-
-    public String getCode() {
-        return code;
-    }
-
-    public int getIndex() {
-        return index;
-    }
-
-    /**
-     * 根据索引查找编号
-     *
-     * @param index 索引
-     * @return 编号
-     */
-    public static String getCodeByIndex(int index) {
-        String result = "";
-        List<CourseDimensionCodeEnum> courseDimensionCodeEnumList = Arrays.stream(CourseDimensionCodeEnum.values())
-                .filter(e -> index == e.getIndex())
-                .collect(Collectors.toList());
-        int size = courseDimensionCodeEnumList.size();
-        if (size > 1) {
-            throw new StatusException("index:" + index + "的编号枚举异常");
-        } else if (size == 1) {
-            result = courseDimensionCodeEnumList.get(0).getCode();
-        }
-        return result;
-    }
-}

distributed-print-business/src/main/java/com/qmth/distributed/print/business/enums/CourseDimensionSourceEnum.java

@@ -1,20 +0,0 @@
-package com.qmth.distributed.print.business.enums;
-
-/**
- * @Description: 课程知识点来源
- * @Author: CaoZixuan
- * @Date: 2024-02-28
- */
-public enum CourseDimensionSourceEnum {
-    UNION_QUESTION("独立题库"), IMPORT("导入");
-
-    private final String name;
-
-    CourseDimensionSourceEnum(String name) {
-        this.name = name;
-    }
-
-    public String getName() {
-        return name;
-    }
-}

distributed-print-business/src/main/java/com/qmth/distributed/print/business/enums/CourseEvaluationTypeEnum.java

@@ -1,41 +0,0 @@
-package com.qmth.distributed.print.business.enums;
-
-/**
- * @Description: 课程评价类型枚举
- * @Author: CaoZixuan
- * @Date: 2024-02-28
- */
-public enum CourseEvaluationTypeEnum {
-    DEFAULT("默认", "期末考试", "按阅卷功能模块里的卷面成绩计算", 0), CUSTOM("自定义", "自定义", "", 1);
-
-    private final String type;
-
-    private final String name;
-
-    private final String value;
-
-    private final int index;
-
-    CourseEvaluationTypeEnum(String type, String name, String value, int index) {
-        this.type = type;
-        this.name = name;
-        this.value = value;
-        this.index = index;
-    }
-
-    public String getType() {
-        return type;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public String getValue() {
-        return value;
-    }
-
-    public int getIndex() {
-        return index;
-    }
-}

distributed-print-business/src/main/java/com/qmth/distributed/print/business/enums/CourseSettingTypeEnum.java

@@ -1,20 +0,0 @@
-package com.qmth.distributed.print.business.enums;
-
-/**
- * @Description: 课程设置类型
- * @Author: CaoZixuan
- * @Date: 2024-02-29
- */
-public enum CourseSettingTypeEnum {
-    COURSE_DIMENSION("课程知识点"), COURSE_TARGET("课程目标"), COURSE_EVALUATION("课程评价方式"), COURSE_WEIGHT("课程权重");
-
-    private final String name;
-
-    CourseSettingTypeEnum(String name) {
-        this.name = name;
-    }
-
-    public String getName() {
-        return name;
-    }
-}

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

@@ -1,15 +1,16 @@
-package com.qmth.distributed.print.business.mapper;
-
-import com.github.jeffreyning.mybatisplus.base.MppBaseMapper;
-
-/**
- * <p>
- * 命题任务选择题库试卷相关文件表 Mapper 接口
- * </p>
- *
- * @author xf
- * @since 2024-02-29
- */
-public interface ExamTaskPaperDataMapper extends MppBaseMapper<ExamTaskPaperData> {
-
-}
+package com.qmth.distributed.print.business.mapper;
+
+import com.github.jeffreyning.mybatisplus.base.MppBaseMapper;
+import com.qmth.distributed.print.business.entity.ExamTaskPaperData;
+
+/**
+ * <p>
+ * 命题任务选择题库试卷相关文件表 Mapper 接口
+ * </p>
+ *
+ * @author xf
+ * @since 2024-02-29
+ */
+public interface ExamTaskPaperDataMapper extends MppBaseMapper<ExamTaskPaperData> {
+
+}

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

@@ -1,49 +0,0 @@
-package com.qmth.distributed.print.business.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.qmth.distributed.print.business.bean.dto.FinalScoreDto;
-import com.qmth.distributed.print.business.bean.result.FinalScoreResult;
-import com.qmth.distributed.print.business.entity.TCFinalScore;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * <p>
- * 期末考试成绩表 Mapper 接口
- * </p>
- *
- * @author wangliang
- * @since 2024-02-18
- */
-public interface TCFinalScoreMapper extends BaseMapper<TCFinalScore> {
-
-    /**
-     * 期末成绩列表（分页）
-     *
-     * @param iPage
-     * @param examId
-     * @param courseCode
-     * @param paperNumber
-     * @param teachCourseId
-     * @return
-     */
-    public IPage<TCFinalScore> finalScoreList(IPage<Map> iPage, @Param("examId") Long examId, @Param("courseId") Long courseId, @Param("paperNumber") String paperNumber, @Param("teachCourseId") Long teachCourseId);
-
-    /**
-     * 查找期末成绩分数图
-     */
-    public FinalScoreDto finalScoreScoreOverView(@Param("examId") Long examId, @Param("courseId") Long courseId, @Param("paperNumber") String paperNumber, @Param("teachCourseId") Long teachCourseId);
-
-    /**
-     * 查找期末成绩分数区间
-     */
-    public int getCountByScoreRange(@Param("examId") Long examId, @Param("courseId") Long courseId, @Param("paperNumber") String paperNumber, @Param("teachCourseId") Long teachCourseId, @Param("start") Double start, @Param("end") Double end);
-
-    /**
-     * 查找考生成绩
-     */
-    public List<FinalScoreResult> examStudentOverview(@Param("examId") Long examId, @Param("courseId") Long courseId, @Param("paperNumber") String paperNumber, @Param("teachCourseId") Long teachCourseId);
-}

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

@@ -1,31 +0,0 @@
-package com.qmth.distributed.print.business.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.qmth.distributed.print.business.bean.result.ScoreResult;
-import com.qmth.distributed.print.business.entity.TCUsualScore;
-import com.qmth.teachcloud.common.bean.dto.DataPermissionRule;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.Map;
-
-/**
- * <p>
- * 平常作业成绩表 Mapper 接口
- * </p>
- *
- * @author wangliang
- * @since 2024-02-18
- */
-public interface TCUsualScoreMapper extends BaseMapper<TCUsualScore> {
-
-    /**
-     * 成绩管理列表
-     */
-    public IPage<ScoreResult> scoreList(IPage<Map> iPage, @Param("examId") Long examId, @Param("courseId") Long courseId, @Param("dpr") DataPermissionRule dpr);
-
-    /**
-     * 平时成绩列表（分页）
-     */
-    public IPage<TCUsualScore> usualScoreList(IPage<Map> iPage, @Param("examId") Long examId, @Param("courseId") Long courseId, @Param("paperNumber") String paperNumber, @Param("teachCourseId") Long teachCourseId);
-}

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

@@ -1,22 +0,0 @@
-package com.qmth.distributed.print.business.mapper;
-
-import com.qmth.distributed.print.business.bean.result.ProfessionalCourseSelectResult;
-import com.qmth.distributed.print.business.entity.TPCourse;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-import java.util.Set;
-
-/**
- * <p>
- * 专业认证课程 Mapper 接口
- * </p>
- *
- * @author xf
- * @since 2024-04-22
- */
-public interface TPCourseMapper extends BaseMapper<TPCourse> {
-
-    List<ProfessionalCourseSelectResult> queryList(@Param("professionalId") Long professionalId, @Param("orgIdSet") Set<Long> orgIdSet);
-}

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

@@ -1,19 +0,0 @@
-package com.qmth.distributed.print.business.mapper;
-
-import com.qmth.distributed.print.business.entity.TPMatrix;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-import java.util.List;
-
-/**
- * <p>
- * 专业认证毕业要求支撑矩阵 Mapper 接口
- * </p>
- *
- * @author xf
- * @since 2024-04-22
- */
-public interface TPMatrixMapper extends BaseMapper<TPMatrix> {
-
-    List<TPMatrix> listMatrix(Long professionalId);
-}

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

@@ -1,22 +0,0 @@
-package com.qmth.distributed.print.business.mapper;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.qmth.distributed.print.business.bean.dto.professional.ProfessionalDto;
-import com.qmth.distributed.print.business.entity.TPProfessional;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.qmth.teachcloud.common.bean.dto.DataPermissionRule;
-import org.apache.ibatis.annotations.Param;
-
-/**
- * <p>
- * 专业认证专业表 Mapper 接口
- * </p>
- *
- * @author xf
- * @since 2024-04-22
- */
-public interface TPProfessionalMapper extends BaseMapper<TPProfessional> {
-
-    IPage<ProfessionalDto> pageData(@Param("page") Page<ProfessionalDto> page, @Param("schoolId") Long schoolId, @Param("name") String name, @Param("orgId") Long orgId, @Param("dpr") DataPermissionRule dpr);
-}

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

@@ -1,16 +0,0 @@
-package com.qmth.distributed.print.business.mapper;
-
-import com.qmth.distributed.print.business.entity.TPRequirement;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 专业认证毕业要求 Mapper 接口
- * </p>
- *
- * @author xf
- * @since 2024-04-22
- */
-public interface TPRequirementMapper extends BaseMapper<TPRequirement> {
-
-}

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

@@ -1,16 +0,0 @@
-package com.qmth.distributed.print.business.mapper;
-
-import com.qmth.distributed.print.business.entity.TRExamStudent;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 报告考生表 Mapper 接口
- * </p>
- *
- * @author wangliang
- * @since 2024-02-18
- */
-public interface TRExamStudentMapper extends BaseMapper<TRExamStudent> {
-
-}

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

@@ -1,15 +1,16 @@
-package com.qmth.distributed.print.business.service;
-
-import com.github.jeffreyning.mybatisplus.service.IMppService;
-
-/**
- * <p>
- * 命题任务选择题库试卷相关文件表 服务类
- * </p>
- *
- * @author xf
- * @since 2024-02-29
- */
-public interface ExamTaskPaperDataService extends IMppService<ExamTaskPaperData> {
-
-}
+package com.qmth.distributed.print.business.service;
+
+import com.github.jeffreyning.mybatisplus.service.IMppService;
+import com.qmth.distributed.print.business.entity.ExamTaskPaperData;
+
+/**
+ * <p>
+ * 命题任务选择题库试卷相关文件表 服务类
+ * </p>
+ *
+ * @author xf
+ * @since 2024-02-29
+ */
+public interface ExamTaskPaperDataService extends IMppService<ExamTaskPaperData> {
+
+}

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

@@ -1,11 +1,9 @@
 package com.qmth.distributed.print.business.service;
 
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.qmth.distributed.print.business.bean.dto.PdfDto;
 import com.qmth.distributed.print.business.bean.dto.PdfPackageDto;
 import com.qmth.distributed.print.business.bean.dto.PdfSignDto;
 import com.qmth.distributed.print.business.bean.excel.ExcelField;
-import com.qmth.distributed.print.business.bean.result.ScoreResult;
 import com.qmth.distributed.print.business.entity.BasicTemplate;
 import com.qmth.distributed.print.business.entity.ExamDetail;
 import com.qmth.teachcloud.common.bean.vo.PrintPathVo;
@@ -174,13 +172,26 @@ public interface PrintCommonService {
 
     /**
      * 成绩管理导入excel校验
+     *
+     * @param file
+     * @param cultureProgramId
+     * @param courseCode
+     * @param paperNumber
+     * @param courseId
+     * @return
      */
-    public MarkPaper scoreImportExcelVaild(MultipartFile file, Long examId, Long courseId, String paperNumber) throws IOException;
+    public MarkPaper scoreImportExcelVaild(MultipartFile file, Long cultureProgramId, String courseCode, String paperNumber, Long courseId) throws IOException;
 
     /**
      * 获取阅卷数据
+     *
+     * @param examId
+     * @param courseCode
+     * @param paperNumber
+     * @param courseId
+     * @return
      */
-    public MarkPaper getMarkPaper(Long examId, Long courseId, String paperNumber);
+    public MarkPaper getMarkPaper(Long examId, String courseCode, String paperNumber, Long courseId);
 
     /**
      * 成绩管理动态生成excel
@@ -192,19 +203,4 @@ public interface PrintCommonService {
      * @throws IOException
      */
     public void scoreDownLoadExaminationTemplate(String describe, String sheetName, String fileName, List<ExcelField> excelFieldList) throws IOException;
-
-    /**
-     * 成绩管理列表
-     *
-     * @param iPage
-     * @param examId
-     * @param courseId
-     * @return
-     */
-    public IPage<ScoreResult> scoreList(IPage<Map> iPage, Long examId, Long courseId);
-
-    /**
-     * 获取成绩管理需要的锁
-     */
-    public void getLock(Long examId, Long courseId, String paperNumber, Long teachCourseId);
 }

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

@@ -1,75 +0,0 @@
-package com.qmth.distributed.print.business.service;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.qmth.distributed.print.business.bean.dto.FinalScoreDto;
-import com.qmth.distributed.print.business.bean.result.FinalScoreResult;
-import com.qmth.distributed.print.business.entity.TCFinalScore;
-import org.springframework.web.multipart.MultipartFile;
-
-import java.io.IOException;
-import java.util.List;
-import java.util.Map;
-
-/**
- * <p>
- * 期末考试成绩表 服务类
- * </p>
- *
- * @author wangliang
- * @since 2024-02-18
- */
-public interface TCFinalScoreService extends IService<TCFinalScore> {
-
-    /**
-     * 导入期末成绩excel
-     */
-    public Map<String, String> finalScoreExcelImport(MultipartFile file, Long examId, Long courseId, String paperNumber, Long teachCourseId) throws IOException;
-
-    /**
-     * 期末成绩列表（分页）
-     */
-    public IPage<TCFinalScore> finalScoreList(IPage<Map> iPage, Long examId, Long courseId, String paperNumber, Long teachCourseId);
-
-    /**
-     * 查找期末成绩分数图
-     */
-    public FinalScoreDto finalScoreScoreOverView(Long examId, Long courseId, String paperNumber, Long teachCourseId);
-
-    /**
-     * 查找期末成绩分数区间
-     *
-     * @param examId
-     */
-    public int getCountByScoreRange(Long examId, Long courseId, String paperNumber, Long teachCourseId, Double start, Double end);
-
-    /**
-     * 查找考生成绩
-     */
-    public List<FinalScoreResult> examStudentOverview(Long examId, Long courseId, String paperNumber, Long teachCourseId);
-
-    /**
-     * 同步期末成绩
-     */
-    public Map<String, String> finalScoreSync(Long examId, Long courseId, String paperNumber, Long teachCourseId) throws IOException;
-
-    /**
-     * 根据考试id/课程编码/试卷编码删除数据
-     */
-    public Boolean remove(Long examId, Long courseId, String paperNumber, Long teachCourseId);
-
-    /**
-     * 根据考试id/课程编码/试卷编码查询数据库数据
-     */
-    public List<TCFinalScore> queryFinalScore(Long examId, Long courseId, String paperNumber, Long teachCourseId);
-
-    /**
-     * 获取期末考试同步锁
-     */
-    public void getFinalScoreSyncLock(Long examId, Long courseId, String paperNumber, Long teachCourseId);
-
-    /**
-     * 获取期末考试导入锁
-     */
-    public void getFinalScoreImportLock(Long examId, Long courseId, String paperNumber, Long teachCourseId);
-}

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

@@ -1,49 +0,0 @@
-package com.qmth.distributed.print.business.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.qmth.distributed.print.business.entity.TCPaperStruct;
-import org.springframework.web.multipart.MultipartFile;
-
-import java.io.IOException;
-import java.util.Map;
-
-/**
- * <p>
- * 试卷蓝图表 服务类
- * </p>
- *
- * @author wangliang
- * @since 2024-02-18
- */
-public interface TCPaperStructService extends IService<TCPaperStruct> {
-
-    /**
-     * 根据考试id/课程编码/试卷编码查询数据库数据
-     */
-    public Boolean remove(Long examId, Long courseId, String paperNumber, Long teachCourseId);
-
-    /**
-     * 导入期末成绩-试卷结构excel
-     */
-    public Map<String, String> paperStructExcelImport(MultipartFile file, Long examId, Long courseId, String paperNumber, Long teachCourseId) throws IOException;
-
-    /**
-     * 同步试卷结构
-     */
-    public Map<String, String> paperStructSync(Long examId, Long courseId, String paperNumber, Long teachCourseId) throws IOException;
-
-    /**
-     * 根据考试id/科目编辑/试卷编码查询数据
-     */
-    public TCPaperStruct queryPaperStruct(Long examId, Long courseId, String paperNumber, Long teachCourseId);
-
-    /**
-     * 获取试卷结构同步锁
-     */
-    public void getPaperStructSyncLock(Long examId, Long courseId, String paperNumber, Long teachCourseId);
-
-    /**
-     * 获取试卷结构导入锁
-     */
-    public void getPaperStructImportLock(Long examId, Long courseId, String paperNumber, Long teachCourseId);
-}

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

@@ -1,31 +0,0 @@
-package com.qmth.distributed.print.business.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.qmth.distributed.print.business.bean.params.professional.TPCourseParam;
-import com.qmth.distributed.print.business.bean.result.ProfessionalCourseSelectResult;
-import com.qmth.distributed.print.business.entity.TPCourse;
-
-import java.util.List;
-
-/**
- * <p>
- * 专业认证课程 服务类
- * </p>
- *
- * @author xf
- * @since 2024-04-22
- */
-public interface TPCourseService extends IService<TPCourse> {
-
-    List<TPCourse> listCourse(Long professionalId);
-
-    boolean saveCourse(TPCourseParam tpCourseParam);
-
-    boolean saveSort(List<TPCourse> courseList);
-
-    boolean removeCourse(Long id);
-
-    List<ProfessionalCourseSelectResult> queryList(Long orgId, Long professionalId);
-
-    int getMaxSortNum(Long professionalId);
-}

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

@@ -1,33 +0,0 @@
-package com.qmth.distributed.print.business.service;
-
-import com.qmth.distributed.print.business.bean.dto.professional.MatrixDto;
-import com.qmth.distributed.print.business.entity.TPCourse;
-import com.qmth.distributed.print.business.entity.TPMatrix;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.qmth.distributed.print.business.entity.TPRequirement;
-
-import javax.servlet.http.HttpServletResponse;
-import java.util.List;
-
-/**
- * <p>
- * 专业认证毕业要求支撑矩阵 服务类
- * </p>
- *
- * @author xf
- * @since 2024-04-22
- */
-public interface TPMatrixService extends IService<TPMatrix> {
-
-    List<MatrixDto> getMatrix(Long professionalId);
-
-    boolean saveMatrix(List<TPMatrix> tpMatrixList);
-
-    void downloadMatrix(Long professionalId, HttpServletResponse response);
-
-    List<TPMatrix> listMatrixByCondition(Long professionalId, Long courseId, Long requirementId);
-
-    void updateMatrixForNodeCount(TPCourse tpCourse, TPRequirement tpRequirement);
-
-    void removeMatrixByCondition(Long professionalId, Long courseId, Long requirementId);
-}

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

@@ -1,22 +0,0 @@
-package com.qmth.distributed.print.business.service;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.qmth.distributed.print.business.bean.dto.professional.ProfessionalDto;
-import com.qmth.distributed.print.business.entity.TPProfessional;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * <p>
- * 专业认证专业表 服务类
- * </p>
- *
- * @author xf
- * @since 2024-04-22
- */
-public interface TPProfessionalService extends IService<TPProfessional> {
-
-    IPage<ProfessionalDto> pageData(Page<ProfessionalDto> page, String name, Long orgId);
-
-    Boolean saveData(TPProfessional tpProfessional);
-}

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

@@ -1,28 +0,0 @@
-package com.qmth.distributed.print.business.service;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.qmth.distributed.print.business.entity.TPRequirement;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-import java.util.List;
-
-/**
- * <p>
- * 专业认证毕业要求 服务类
- * </p>
- *
- * @author xf
- * @since 2024-04-22
- */
-public interface TPRequirementService extends IService<TPRequirement> {
-
-    List<TPRequirement> listRequirement(Long professionalId);
-
-    boolean saveRequirement(TPRequirement tpRequirement);
-
-    boolean saveSort(List<TPRequirement> requirementList);
-
-    boolean removeRequirement(Long id);
-
-    int getMaxSortNum(Long professionalId);
-}

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

@@ -1,42 +0,0 @@
-package com.qmth.distributed.print.business.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.qmth.distributed.print.business.bean.dto.report.ReportExamStudentDto;
-import com.qmth.distributed.print.business.entity.TRBasicInfo;
-import com.qmth.distributed.print.business.entity.TRExamStudent;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * <p>
- * 报告考生表 服务类
- * </p>
- *
- * @author wangliang
- * @since 2024-02-18
- */
-public interface TRExamStudentService extends IService<TRExamStudent> {
-
-    /**
-     * 获取考生详细报告
-     *
-     * @param trBasicInfo
-     * @param paramsMap
-     * @return
-     */
-    public List<ReportExamStudentDto> getExamStudentReportDetail(TRBasicInfo trBasicInfo, Map<String, Object> paramsMap);
-
-    /**
-     * 根据报告id删除数据
-     *
-     * @param rBasicInfoId
-     * @return
-     */
-    public Boolean remove(Long rBasicInfoId);
-
-    /**
-     * 根据考试id/课程编码/试卷编码删除数据
-     */
-    public Boolean remove(Long examId, Long courseId, String paperNumber, Long teachCourseId);
-}

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

@@ -1,19 +1,20 @@
-package com.qmth.distributed.print.business.service.impl;
-
-import com.github.jeffreyning.mybatisplus.service.MppServiceImpl;
-import com.qmth.distributed.print.business.mapper.ExamTaskPaperDataMapper;
-import com.qmth.distributed.print.business.service.ExamTaskPaperDataService;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 命题任务选择题库试卷相关文件表 服务实现类
- * </p>
- *
- * @author xf
- * @since 2024-02-29
- */
-@Service
-public class ExamTaskPaperDataServiceImpl extends MppServiceImpl<ExamTaskPaperDataMapper, ExamTaskPaperData> implements ExamTaskPaperDataService {
-
-}
+package com.qmth.distributed.print.business.service.impl;
+
+import com.github.jeffreyning.mybatisplus.service.MppServiceImpl;
+import com.qmth.distributed.print.business.entity.ExamTaskPaperData;
+import com.qmth.distributed.print.business.mapper.ExamTaskPaperDataMapper;
+import com.qmth.distributed.print.business.service.ExamTaskPaperDataService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 命题任务选择题库试卷相关文件表 服务实现类
+ * </p>
+ *
+ * @author xf
+ * @since 2024-02-29
+ */
+@Service
+public class ExamTaskPaperDataServiceImpl extends MppServiceImpl<ExamTaskPaperDataMapper, ExamTaskPaperData> implements ExamTaskPaperDataService {
+
+}

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

@@ -5,24 +5,18 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.itextpdf.text.pdf.PdfReader;
 import com.qmth.boot.api.exception.ApiException;
 import com.qmth.distributed.print.business.bean.dto.PdfDto;
 import com.qmth.distributed.print.business.bean.dto.PdfPackageDto;
 import com.qmth.distributed.print.business.bean.dto.PdfSignDto;
 import com.qmth.distributed.print.business.bean.excel.ExcelField;
-import com.qmth.distributed.print.business.bean.params.ExamTaskStudentObjectParam;
-import com.qmth.distributed.print.business.bean.result.ScoreResult;
 import com.qmth.distributed.print.business.entity.*;
 import com.qmth.distributed.print.business.enums.ExamDetailStatusEnum;
 import com.qmth.distributed.print.business.enums.PrintPlanStatusEnum;
-import com.qmth.distributed.print.business.mapper.TCUsualScoreMapper;
 import com.qmth.distributed.print.business.service.*;
 import com.qmth.distributed.print.business.util.CreatePrintPdfUtil;
 import com.qmth.distributed.print.business.util.PdfUtil;
-import com.qmth.teachcloud.common.bean.dto.DataPermissionRule;
 import com.qmth.teachcloud.common.bean.result.TbTaskDetailResult;
 import com.qmth.teachcloud.common.bean.vo.FilePathVo;
 import com.qmth.teachcloud.common.bean.vo.PrintPathVo;
@@ -31,7 +25,6 @@ import com.qmth.teachcloud.common.contant.SpringContextHolder;
 import com.qmth.teachcloud.common.contant.SystemConstant;
 import com.qmth.teachcloud.common.entity.*;
 import com.qmth.teachcloud.common.enums.*;
-import com.qmth.teachcloud.common.mapper.BasicCourseMapper;
 import com.qmth.teachcloud.common.service.*;
 import com.qmth.teachcloud.common.util.*;
 import com.qmth.teachcloud.mark.entity.MarkPaper;
@@ -62,7 +55,6 @@ import java.math.BigDecimal;
 import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
 import java.util.*;
-import java.util.concurrent.atomic.AtomicInteger;
 
 /**
  * @Description: 公共服务service impl
@@ -77,68 +69,67 @@ public class PrintCommonServiceImpl implements PrintCommonService {
 
     @Resource
     private DictionaryConfig dictionaryConfig;
+
     @Resource
     private BasicAttachmentService basicAttachmentService;
+
     @Resource
     @Lazy
     private ExamTaskService examTaskService;
-    @Resource
-    private BasicCourseMapper basicCourseMapper;
+
     @Resource
     @Lazy
     private BasicCourseService basicCourseService;
+
     @Resource
     private ExamDetailCourseService examDetailCourseService;
+
     @Resource
     private SysOrgService sysOrgService;
+
     @Resource
     private TBTaskService tbTaskService;
+
     @Resource
     private TBTaskPdfService tbTaskPdfService;
+
     @Resource
     @Lazy
     private ExamDetailService examDetailService;
+
     @Resource
     @Lazy
     private ExamTaskDetailService examTaskDetailService;
+
     @Resource
     private ExamPrintPlanService examPrintPlanService;
+
     @Resource
     private TFFlowApproveService tfFlowApproveService;
+
     @Resource
     private FileStoreUtil fileStoreUtil;
+
     @Resource
     private FileUploadService fileUploadService;
+
     @Resource
     private TeachcloudCommonService teachcloudCommonService;
-    @Resource
-    private RedisUtil redisUtil;
+
     @Resource
     private BasicExamService basicExamService;
+
     @Resource
     private GradeBatchPaperService gradeBatchPaperService;
-    @Resource
-    private BasicTeachClazzService basicTeachClazzService;
-    @Resource
-    private BasicExamStudentService basicExamStudentService;
+
     @Resource
     private CreatePrintPdfUtil createPrintPdfUtil;
+
     @Resource
     private CommonCacheService commonCacheService;
+
     @Resource
     private RedisCounterUtil redisCounterUtil;
-    @Resource
-    private MarkPaperService markPaperService;
-    @Resource
-    private TCUsualScoreMapper tcUsualScoreMapper;
-    @Resource
-    private BasicRoleDataPermissionService basicRoleDataPermissionService;
-    @Resource
-    @Lazy
-    private TCFinalScoreService tcFinalScoreService;
-    @Resource
-    @Lazy
-    private TCPaperStructService tcPaperStructService;
 
     @Override
     @Transactional
@@ -223,38 +214,39 @@ public class PrintCommonServiceImpl implements PrintCommonService {
      * 成绩管理导入excel校验
      *
      * @param file
-     * @param examId
+     * @param cultureProgramId
      * @param courseCode
      * @param paperNumber
+     * @param courseId
      * @return
+     * @throws IOException
      */
     @Override
-    public MarkPaper scoreImportExcelVaild(MultipartFile file, Long examId, Long courseId, String paperNumber) throws IOException {
+    public MarkPaper scoreImportExcelVaild(MultipartFile file, Long cultureProgramId, String courseCode, String paperNumber, Long courseId) throws IOException {
         String reqFileMd5 = ServletUtil.getRequestMd5();
         String fileMd5 = DigestUtils.md5Hex(file.getBytes());
         if (!Objects.equals(fileMd5, reqFileMd5)) {
             throw ExceptionResultEnum.MD5_EQUALS_FALSE.exception();
         }
-        return this.getMarkPaper(examId, courseId, paperNumber);
+        return this.getMarkPaper(null, courseCode, paperNumber, courseId);
     }
 
     /**
      * 获取阅卷数据
      *
      * @param examId
+     * @param courseCode
      * @param paperNumber
+     * @param courseId
      * @return
      */
     @Override
-    public MarkPaper getMarkPaper(Long examId, Long courseId, String paperNumber) {
-        MarkPaper markPaper = markPaperService.getByExamIdAndPaperNumber(examId, paperNumber);
-        if (Objects.isNull(markPaper)) {
-            BasicCourse basicCourse = basicCourseService.getById(courseId);
-            Objects.requireNonNull(basicCourse, "未找到基础课程信息");
-            // todo 课程ID，目标达成度，未改
-            markPaper = new MarkPaper(examId, courseId, paperNumber, 100d, 60d);
+    public MarkPaper getMarkPaper(Long examId, String courseCode, String paperNumber, Long courseId) {
+        BasicCourse basicCourse = null;
+        if (Objects.nonNull(courseId)) {
+            basicCourse = basicCourseService.getById(courseId);
         }
-        return markPaper;
+        return new MarkPaper(examId, Objects.nonNull(basicCourse) ? basicCourse.getCode() : null, Objects.nonNull(basicCourse) ? basicCourse.getName() : null, paperNumber, 100d, 60d);
     }
 
     /**
@@ -356,27 +348,6 @@ public class PrintCommonServiceImpl implements PrintCommonService {
         log.debug("导出Excel结束...");
     }
 
-    /**
-     * 成绩管理列表
-     */
-    @Override
-    public IPage<ScoreResult> scoreList(IPage<Map> iPage, Long examId, Long courseId) {
-        SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
-        DataPermissionRule dpr = basicRoleDataPermissionService.findDataPermission(sysUser.getSchoolId(), sysUser.getId(), ServletUtil.getRequest().getServletPath());
-        return tcUsualScoreMapper.scoreList(iPage, examId, courseId, dpr);
-    }
-
-    /**
-     * 获取成绩管理需要的锁
-     */
-    @Override
-    public void getLock(Long examId, Long courseId, String paperNumber, Long teachCourseId) {
-        tcFinalScoreService.getFinalScoreSyncLock(examId, courseId, paperNumber, teachCourseId);
-        tcFinalScoreService.getFinalScoreImportLock(examId, courseId, paperNumber, teachCourseId);
-        tcPaperStructService.getPaperStructSyncLock(examId, courseId, paperNumber, teachCourseId);
-        tcPaperStructService.getPaperStructImportLock(examId, courseId, paperNumber, teachCourseId);
-    }
-
     /**
      * 保存html附件
      *

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

@@ -1,132 +0,0 @@
-package com.qmth.distributed.print.business.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.qmth.distributed.print.business.bean.params.professional.TPCourseParam;
-import com.qmth.distributed.print.business.bean.result.ProfessionalCourseSelectResult;
-import com.qmth.distributed.print.business.entity.TPCourse;
-import com.qmth.distributed.print.business.entity.TPRequirement;
-import com.qmth.distributed.print.business.mapper.TPCourseMapper;
-import com.qmth.distributed.print.business.service.TPCourseService;
-import com.qmth.distributed.print.business.service.TPMatrixService;
-import com.qmth.distributed.print.business.service.TPRequirementService;
-import com.qmth.teachcloud.common.bean.result.TeachCourseSelectResult;
-import com.qmth.teachcloud.common.entity.BasicCourse;
-import com.qmth.teachcloud.common.entity.SysOrg;
-import com.qmth.teachcloud.common.entity.SysUser;
-import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
-import com.qmth.teachcloud.common.service.SysOrgService;
-import com.qmth.teachcloud.common.util.ServletUtil;
-import org.apache.commons.collections4.CollectionUtils;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import javax.annotation.Resource;
-import java.util.*;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-/**
- * <p>
- * 专业认证课程 服务实现类
- * </p>
- *
- * @author xf
- * @since 2024-04-22
- */
-@Service
-public class TPCourseServiceImpl extends ServiceImpl<TPCourseMapper, TPCourse> implements TPCourseService {
-
-    @Resource
-    private TPRequirementService tpRequirementService;
-    @Resource
-    private TPMatrixService tpMatrixService;
-    @Resource
-    private SysOrgService sysOrgService;
-
-    @Override
-    public List<TPCourse> listCourse(Long professionalId) {
-        QueryWrapper<TPCourse> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(TPCourse::getProfessionalId, professionalId)
-                .orderByAsc(TPCourse::getSortNum);
-        return this.list(queryWrapper);
-    }
-
-    @Transactional
-    @Override
-    public boolean saveCourse(TPCourseParam tpCourseParam) {
-        SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
-        List<TPCourse> tpCourseList = new ArrayList<>();
-        AtomicInteger i = new AtomicInteger(1);
-        int maxSortNum = this.getMaxSortNum(tpCourseParam.getProfessionalId());
-        tpCourseParam.getCourses().forEach(t -> {
-            TPCourse tpCourse = new TPCourse();
-            tpCourse.setProfessionalId(tpCourseParam.getProfessionalId());
-            tpCourse.setCourseCode(t.getCourseCode());
-            tpCourse.setCourseName(t.getCourseName());
-            tpCourse.setSortNum(maxSortNum + i.getAndIncrement());
-            tpCourse.insertInfo(sysUser.getId());
-            tpCourseList.add(tpCourse);
-        });
-
-        List<TPRequirement> tpRequirementList = tpRequirementService.listRequirement(tpCourseParam.getProfessionalId());
-        if (CollectionUtils.isNotEmpty(tpRequirementList)) {
-            // 增加矩阵数据
-            for (TPCourse tpCourse : tpCourseList) {
-                for (TPRequirement tpRequirement : tpRequirementList) {
-                    tpMatrixService.updateMatrixForNodeCount(tpCourse, tpRequirement);
-                }
-            }
-        }
-
-        this.saveBatch(tpCourseList);
-        return true;
-    }
-
-    @Transactional
-    @Override
-    public boolean saveSort(List<TPCourse> courseList) {
-        courseList.forEach(t -> {
-            if (t.getId() != null && t.getSortNum() != null) {
-                UpdateWrapper<TPCourse> updateWrapper = new UpdateWrapper();
-                updateWrapper.lambda().set(TPCourse::getSortNum, t.getSortNum())
-                        .eq(TPCourse::getId, t.getId());
-                this.update(updateWrapper);
-            }
-        });
-        return true;
-    }
-
-    @Transactional
-    @Override
-    public boolean removeCourse(Long id) {
-        tpMatrixService.removeMatrixByCondition(null, id, null);
-        return this.removeById(id);
-    }
-
-    @Override
-    public List<ProfessionalCourseSelectResult> queryList(Long orgId, Long professionalId) {
-        if (orgId == null) {
-            throw ExceptionResultEnum.ERROR.exception("请选择学院");
-        }
-        Set<Long> orgIdSet = sysOrgService.findDeepOrgIdListByOrgIdList(Arrays.asList(orgId));
-
-        return this.baseMapper.queryList(professionalId, orgIdSet);
-    }
-
-    @Override
-    public int getMaxSortNum(Long professionalId) {
-        QueryWrapper<TPCourse> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(TPCourse::getProfessionalId, professionalId)
-                .orderByDesc(TPCourse::getSortNum)
-                .last("limit 1");
-        TPCourse tpCourse = this.getOne(queryWrapper);
-        if (tpCourse == null) {
-            return 0;
-        } else {
-            return tpCourse.getSortNum();
-        }
-    }
-}

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

@@ -1,396 +0,0 @@
-package com.qmth.distributed.print.business.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.qmth.boot.tools.excel.ExcelWriter;
-import com.qmth.boot.tools.excel.enums.ExcelType;
-import com.qmth.boot.tools.excel.model.DataMap;
-import com.qmth.distributed.print.business.bean.dto.professional.MatrixDto;
-import com.qmth.distributed.print.business.bean.dto.professional.MatrixRequirementDto;
-import com.qmth.distributed.print.business.bean.dto.professional.MatrixSubRequirementDto;
-import com.qmth.distributed.print.business.bean.dto.professional.ProfessionalExportHead;
-import com.qmth.distributed.print.business.entity.*;
-import com.qmth.distributed.print.business.mapper.TPMatrixMapper;
-import com.qmth.distributed.print.business.service.*;
-import com.qmth.teachcloud.common.contant.SystemConstant;
-import com.qmth.teachcloud.common.entity.SysPrivilege;
-import com.qmth.teachcloud.common.entity.SysUser;
-import com.qmth.teachcloud.common.enums.RoleTypeEnum;
-import com.qmth.teachcloud.common.service.SysPrivilegeService;
-import com.qmth.teachcloud.common.util.ServletUtil;
-import org.apache.commons.collections4.CollectionUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.poi.hssf.usermodel.*;
-import org.apache.poi.ss.usermodel.*;
-import org.apache.poi.ss.util.CellRangeAddress;
-import org.apache.poi.xssf.usermodel.*;
-import org.springframework.stereotype.Service;
-import org.springframework.util.LinkedMultiValueMap;
-
-import javax.annotation.Resource;
-import javax.servlet.ServletOutputStream;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.net.URLEncoder;
-import java.util.*;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.stream.Collectors;
-
-/**
- * <p>
- * 专业认证毕业要求支撑矩阵 服务实现类
- * </p>
- *
- * @author xf
- * @since 2024-04-22
- */
-@Service
-public class TPMatrixServiceImpl extends ServiceImpl<TPMatrixMapper, TPMatrix> implements TPMatrixService {
-
-    @Resource
-    private TPProfessionalService tpProfessionalService;
-    @Resource
-    private TPCourseService tpCourseService;
-    @Resource
-    private TPRequirementService tpRequirementService;
-    @Resource
-    private SysPrivilegeService sysPrivilegeService;
-    @Resource
-    private TeachCourseService teachCourseService;
-
-    @Override
-    public List<MatrixDto> getMatrix(Long professionalId) {
-        SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
-        List<TPMatrix> tpMatrixList = this.baseMapper.listMatrix(professionalId);
-        if (CollectionUtils.isNotEmpty(tpMatrixList)) {
-            List<SysPrivilege> sysPrivileges = sysPrivilegeService.getClientUrlByUserId(sysUser.getId());
-            boolean canEditCourse = sysPrivileges.stream().filter(m -> m.getId() == 2056L && "canEditCourse".equals(m.getUrl())).count() > 0;
-            List<Long> codeList = new ArrayList<>();
-            if (!canEditCourse) {
-                List<TeachCourse> teachCourseList = teachCourseService.list(new QueryWrapper<TeachCourse>().lambda().eq(TeachCourse::getUserId, sysUser.getId()));
-                if (CollectionUtils.isNotEmpty(teachCourseList)) {
-                    codeList = teachCourseList.stream().map(TeachCourse::getCourseId).distinct().collect(Collectors.toList());
-                }
-            }
-
-            List<MatrixDto> matrixDtoList = new ArrayList<>();
-            LinkedMultiValueMap<Long, TPMatrix> courseMap = new LinkedMultiValueMap<>();
-            for (TPMatrix tpMatrix : tpMatrixList) {
-                courseMap.add(tpMatrix.getCourseId(), tpMatrix);
-            }
-            List<Long> finalCodeList = codeList;
-            courseMap.entrySet().stream().forEach(entry -> {
-                TPCourse tpCourse = tpCourseService.getById(entry.getKey());
-                MatrixDto matrixDto = new MatrixDto();
-                matrixDto.setCourseCode(tpCourse.getCourseCode());
-                matrixDto.setCourseName(tpCourse.getCourseName());
-                matrixDto.setCanEdit(canEditCourse || finalCodeList.contains(tpCourse.getCourseId()));
-                List<MatrixRequirementDto> matrixRequirementDtoList = new ArrayList<>();
-                LinkedMultiValueMap<Long, TPMatrix> requirementMap = new LinkedMultiValueMap<>();
-                for (TPMatrix tpMatrix : entry.getValue()) {
-                    requirementMap.add(tpMatrix.getRequirementId(), tpMatrix);
-                }
-                requirementMap.entrySet().stream().forEach(requirementEntry -> {
-                    TPRequirement tpRequirement = tpRequirementService.getById(requirementEntry.getKey());
-                    MatrixRequirementDto matrixRequirementDto = new MatrixRequirementDto();
-                    matrixRequirementDto.setName(tpRequirement.getName());
-                    List<TPMatrix> requirementList = requirementEntry.getValue();
-                    // 排序，解决字符串1和10排序问题
-                    if (requirementList.size() > 1) {
-                        requirementList.sort(Comparator.comparingInt(o -> Integer.parseInt(o.getSubName())));
-                    }
-                    List<MatrixSubRequirementDto> matrixSubRequirementDtoList = requirementList.stream().map(tpMatrix -> {
-                        MatrixSubRequirementDto matrixSubRequirementDto = new MatrixSubRequirementDto();
-                        matrixSubRequirementDto.setId(tpMatrix.getId());
-                        matrixSubRequirementDto.setName(StringUtils.isNotBlank(tpMatrix.getSubName()) ? tpMatrix.getRequirementSortNum() + "-" + tpMatrix.getSubName() : tpMatrix.getSubName());
-                        matrixSubRequirementDto.setContent(tpMatrix.getContent());
-                        return matrixSubRequirementDto;
-                    }).collect(Collectors.toList());
-                    matrixRequirementDto.setSubRequirements(matrixSubRequirementDtoList);
-                    matrixRequirementDtoList.add(matrixRequirementDto);
-                });
-                matrixDto.setRequirements(matrixRequirementDtoList);
-                matrixDtoList.add(matrixDto);
-            });
-            return matrixDtoList;
-        }
-        return new ArrayList<>();
-    }
-
-    @Override
-    public boolean saveMatrix(List<TPMatrix> tpMatrixList) {
-        for (TPMatrix tpMatrix : tpMatrixList) {
-            UpdateWrapper<TPMatrix> updateWrapper = new UpdateWrapper<>();
-            updateWrapper.lambda().set(TPMatrix::getContent, tpMatrix.getContent())
-                    .eq(TPMatrix::getId, tpMatrix.getId());
-            this.update(updateWrapper);
-        }
-        return true;
-    }
-
-    @Override
-    public void downloadMatrix(Long professionalId, HttpServletResponse response) {
-        List<TPMatrix> tpMatrixList = this.baseMapper.listMatrix(professionalId);
-        if (CollectionUtils.isNotEmpty(tpMatrixList)) {
-            TPProfessional tpProfessional = tpProfessionalService.getById(professionalId);
-            // 表头
-            List<ProfessionalExportHead> professionalExportHeadList = new ArrayList<>();
-            // 默认课程
-            professionalExportHeadList.add(new ProfessionalExportHead("", 0, Arrays.asList("")));
-            List<TPRequirement> tpRequirementList = tpRequirementService.listRequirement(professionalId);
-            for (TPRequirement tpRequirement : tpRequirementList) {
-                List<String> subNameList = new ArrayList<>();
-                if (tpRequirement.getNodeCount() == null) {
-                    subNameList.add("");
-                } else {
-                    for (Integer i = 1; i <= tpRequirement.getNodeCount(); i++) {
-                        subNameList.add(tpRequirement.getSortNum() + "-" + i);
-                    }
-                }
-                professionalExportHeadList.add(new ProfessionalExportHead(tpRequirement.getName(), tpRequirement.getSortNum(), subNameList));
-            }
-
-            // 内容
-            List<List<String>> contentList = new ArrayList<>();
-            LinkedMultiValueMap<Long, TPMatrix> courseMap = new LinkedMultiValueMap<>();
-            for (TPMatrix tpMatrix : tpMatrixList) {
-                courseMap.add(tpMatrix.getCourseId(), tpMatrix);
-            }
-            courseMap.entrySet().stream().forEach(entry -> {
-                List<String> content = new ArrayList<>();
-                TPCourse tpCourse = tpCourseService.getById(entry.getKey());
-                content.add(tpCourse.getCourseName());
-                LinkedMultiValueMap<Long, TPMatrix> requirementMap = new LinkedMultiValueMap<>();
-                for (TPMatrix tpMatrix : entry.getValue()) {
-                    requirementMap.add(tpMatrix.getRequirementId(), tpMatrix);
-                }
-                for (Map.Entry<Long, List<TPMatrix>> requirementEntry : requirementMap.entrySet()) {
-                   List<TPMatrix> requirementList = requirementEntry.getValue();
-                    // 排序，解决字符串1和10排序问题
-                    if (requirementList.size() > 1) {
-                        requirementList.sort(Comparator.comparingInt(o -> Integer.parseInt(o.getSubName())));
-                    }
-                    requirementList.stream().forEach(tpMatrix -> content.add(tpMatrix.getContent() == null ? "" : String.valueOf(tpMatrix.getContent())));
-                }
-                contentList.add(content);
-            });
-
-            // 生成excel
-            exportExcel(response, professionalExportHeadList, contentList, tpProfessional.getName());
-        }
-    }
-
-    private void exportExcel(HttpServletResponse response, List<ProfessionalExportHead> professionalExportHeadList, List<List<String>> contentList, String professionalName) {
-        XSSFWorkbook wb = new XSSFWorkbook();
-        XSSFSheet sheet = wb.createSheet("sheet1");
-
-        // 表对样式
-        XSSFCellStyle styleHead = wb.createCellStyle(); // 样式对象
-        styleHead.setVerticalAlignment(VerticalAlignment.CENTER);// 垂直
-        styleHead.setAlignment(HorizontalAlignment.CENTER);// 水平
-        Font font = wb.createFont();
-        font.setBold(true);
-        //设置字体样式
-        font.setFontHeightInPoints((short) 12);//设置字体大小
-        styleHead.setFont(font);
-
-        //表格第一行（一级表头）
-        XSSFRow row1 = sheet.createRow(0);
-        // 计算一级表头合并单元格数量
-        Integer requirementCount = professionalExportHeadList.stream().filter(m -> m.getSubName() != null).map(m -> m.getSubName().size()).collect(Collectors.summingInt(Integer::intValue));
-
-        for (int i = 0; i < requirementCount; i++) {
-            sheet.autoSizeColumn(i, true);
-        }
-
-        sheet.addMergedRegion(new CellRangeAddress(0, 0, 1, requirementCount));
-        XSSFCell cell0 = row1.createCell(0);
-        cell0.setCellStyle(styleHead);
-        cell0.setCellValue("课程名称");
-        XSSFCell cell1 = row1.createCell(1);
-        cell1.setCellStyle(styleHead);
-        cell1.setCellValue("毕业要求");
-
-        //表格第二行（二级表头）
-        XSSFRow row2 = sheet.createRow(1);
-        XSSFCell cell2;
-        int num = 0;
-        for (int i = 0; i < professionalExportHeadList.size(); i++) {
-            ProfessionalExportHead professionalExportHead = professionalExportHeadList.get(i);
-            num = num + professionalExportHead.getSubName().size();
-            int firstCol = num - professionalExportHead.getSubName().size();
-            int lastCol = firstCol + professionalExportHead.getSubName().size() - 1;
-            cell2 = row2.createCell(firstCol);
-            cell2.setCellStyle(styleHead);
-            cell2.setCellValue(professionalExportHead.getRequirementName());
-            if (firstCol < lastCol) {
-                sheet.addMergedRegion(new CellRangeAddress(1, 1, firstCol, lastCol));
-            }
-        }
-
-        //表格第三行（三级表头）
-        XSSFRow row3 = sheet.createRow(2);
-        XSSFCell cell3;
-        AtomicInteger atomicInteger = new AtomicInteger(0);
-        for (ProfessionalExportHead professionalExportHead : professionalExportHeadList) {
-            for (String s : professionalExportHead.getSubName()) {
-                cell3 = row3.createCell(atomicInteger.getAndIncrement());
-                cell3.setCellStyle(styleHead);
-                cell3.setCellValue(s);
-            }
-        }
-        // 合并课程名称
-        sheet.addMergedRegion(new CellRangeAddress(0, 2, 0, 0));
-
-        AtomicInteger i = new AtomicInteger(3);
-        XSSFRow row;
-        for (List<String> list : contentList) {
-            row = sheet.createRow(i.getAndIncrement());
-            XSSFCell cell;
-            for (int j = 0; j < list.size(); j++) {
-                cell = row.createCell(j);
-                cell.setCellValue(list.get(j));
-            }
-        }
-
-        ServletOutputStream outputStream = null;
-        try {
-            response.setHeader("Content-Disposition", "filename=" + URLEncoder.encode(professionalName + "毕业要求支撑矩阵", SystemConstant.CHARSET_NAME) + SystemConstant.EXCEL_PREFIX);
-            response.setContentType("application/vnd.ms-excel");
-            outputStream = response.getOutputStream();
-            wb.write(outputStream);
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    @Override
-    public List<TPMatrix> listMatrixByCondition(Long professionalId, Long courseId, Long requirementId) {
-        QueryWrapper<TPMatrix> queryWrapper = new QueryWrapper<>();
-        LambdaQueryWrapper<TPMatrix> lambda = queryWrapper.lambda();
-        lambda.eq(TPMatrix::getProfessionalId, professionalId);
-        if (courseId != null) {
-            lambda.eq(TPMatrix::getCourseId, courseId);
-        }
-        if (requirementId != null) {
-            lambda.eq(TPMatrix::getRequirementId, requirementId);
-        }
-        return this.list(queryWrapper);
-    }
-
-    @Override
-    public void updateMatrixForNodeCount(TPCourse tpCourse, TPRequirement tpRequirement) {
-        SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
-        List<TPMatrix> matrixList = this.listMatrixByCondition(tpRequirement.getProfessionalId(), tpCourse.getId(), tpRequirement.getId());
-        List<TPMatrix> tpMatrixAddList = new ArrayList<>();
-        List<Long> tpMatrixRemoveList = new ArrayList<>();
-        // 新增
-        if (CollectionUtils.isEmpty(matrixList)) {
-            if (tpRequirement.getNodeCount() == null) {
-                TPMatrix tpMatrix = new TPMatrix();
-                tpMatrix.insertInfo(sysUser.getId());
-                tpMatrix.setProfessionalId(tpRequirement.getProfessionalId());
-                tpMatrix.setCourseId(tpCourse.getId());
-                tpMatrix.setRequirementId(tpRequirement.getId());
-                tpMatrixAddList.add(tpMatrix);
-            } else {
-                for (int i = 1; i <= tpRequirement.getNodeCount(); i++) {
-                    TPMatrix tpMatrix = new TPMatrix();
-                    tpMatrix.insertInfo(sysUser.getId());
-                    tpMatrix.setProfessionalId(tpRequirement.getProfessionalId());
-                    tpMatrix.setCourseId(tpCourse.getId());
-                    tpMatrix.setRequirementId(tpRequirement.getId());
-                    tpMatrix.setSubName(String.valueOf(i));
-                    tpMatrixAddList.add(tpMatrix);
-                }
-            }
-        }
-        // 修改
-        else {
-            if (tpRequirement.getNodeCount() == null) {
-                for (int i = 0; i < matrixList.size(); i++) {
-                    tpMatrixRemoveList.add(matrixList.get(i).getId());
-                }
-                TPMatrix tpMatrix = new TPMatrix();
-                tpMatrix.insertInfo(sysUser.getId());
-                tpMatrix.setProfessionalId(tpRequirement.getProfessionalId());
-                tpMatrix.setCourseId(tpCourse.getId());
-                tpMatrix.setRequirementId(tpRequirement.getId());
-                tpMatrixAddList.add(tpMatrix);
-            } else {
-                if (matrixList.size() == 1) {
-                    if (matrixList.get(0).getSubName() == null) {
-                        tpMatrixRemoveList.add(matrixList.get(0).getId());
-
-                        for (int i = 1; i <= tpRequirement.getNodeCount(); i++) {
-                            TPMatrix tpMatrix = new TPMatrix();
-                            tpMatrix.insertInfo(sysUser.getId());
-                            tpMatrix.setProfessionalId(tpRequirement.getProfessionalId());
-                            tpMatrix.setCourseId(tpCourse.getId());
-                            tpMatrix.setRequirementId(tpRequirement.getId());
-                            tpMatrix.setSubName(String.valueOf(i));
-                            tpMatrixAddList.add(tpMatrix);
-                        }
-                    } else {
-                        if (tpRequirement.getNodeCount() > matrixList.size()) {
-                            for (int i = matrixList.size() + 1; i <= tpRequirement.getNodeCount(); i++) {
-                                TPMatrix tpMatrix = new TPMatrix();
-                                tpMatrix.insertInfo(sysUser.getId());
-                                tpMatrix.setProfessionalId(tpRequirement.getProfessionalId());
-                                tpMatrix.setCourseId(tpCourse.getId());
-                                tpMatrix.setRequirementId(tpRequirement.getId());
-                                tpMatrix.setSubName(String.valueOf(i));
-                                tpMatrixAddList.add(tpMatrix);
-                            }
-                        } else if (tpRequirement.getNodeCount() < matrixList.size()) {
-                            for (int i = tpRequirement.getNodeCount(); i <= matrixList.size() - 1; i++) {
-                                tpMatrixRemoveList.add(matrixList.get(i).getId());
-                            }
-                        }
-                    }
-                } else {
-                    if (tpRequirement.getNodeCount() > matrixList.size()) {
-                        for (int i = matrixList.size() + 1; i <= tpRequirement.getNodeCount(); i++) {
-                            TPMatrix tpMatrix = new TPMatrix();
-                            tpMatrix.insertInfo(sysUser.getId());
-                            tpMatrix.setProfessionalId(tpRequirement.getProfessionalId());
-                            tpMatrix.setCourseId(tpCourse.getId());
-                            tpMatrix.setRequirementId(tpRequirement.getId());
-                            tpMatrix.setSubName(String.valueOf(i));
-                            tpMatrixAddList.add(tpMatrix);
-                        }
-                    } else if (tpRequirement.getNodeCount() < matrixList.size()) {
-                        for (int i = tpRequirement.getNodeCount(); i <= matrixList.size() - 1; i++) {
-                            tpMatrixRemoveList.add(matrixList.get(i).getId());
-                        }
-                    }
-                }
-            }
-        }
-        if (CollectionUtils.isNotEmpty(tpMatrixAddList)) {
-            this.saveOrUpdateBatch(tpMatrixAddList);
-        }
-        if (CollectionUtils.isNotEmpty(tpMatrixRemoveList)) {
-            this.removeByIds(tpMatrixRemoveList);
-        }
-    }
-
-    @Override
-    public void removeMatrixByCondition(Long professionalId, Long courseId, Long requirementId) {
-        UpdateWrapper<TPMatrix> updateWrapper = new UpdateWrapper<>();
-        LambdaUpdateWrapper<TPMatrix> lambda = updateWrapper.lambda();
-        if (professionalId != null) {
-            lambda.eq(TPMatrix::getProfessionalId, professionalId);
-        }
-        if (courseId != null) {
-            lambda.eq(TPMatrix::getCourseId, courseId);
-        }
-        if (requirementId != null) {
-            lambda.eq(TPMatrix::getRequirementId, requirementId);
-        }
-        this.remove(updateWrapper);
-    }
-}

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

@@ -1,70 +0,0 @@
-package com.qmth.distributed.print.business.service.impl;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.qmth.distributed.print.business.bean.dto.professional.ProfessionalDto;
-import com.qmth.distributed.print.business.entity.TPProfessional;
-import com.qmth.distributed.print.business.entity.TPRequirement;
-import com.qmth.distributed.print.business.enums.ProfessionalCertificationEnum;
-import com.qmth.distributed.print.business.mapper.TPProfessionalMapper;
-import com.qmth.distributed.print.business.service.TPProfessionalService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.qmth.distributed.print.business.service.TPRequirementService;
-import com.qmth.teachcloud.common.bean.dto.DataPermissionRule;
-import com.qmth.teachcloud.common.entity.SysUser;
-import com.qmth.teachcloud.common.service.BasicRoleDataPermissionService;
-import com.qmth.teachcloud.common.util.ServletUtil;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * <p>
- * 专业认证专业表 服务实现类
- * </p>
- *
- * @author xf
- * @since 2024-04-22
- */
-@Service
-public class TPProfessionalServiceImpl extends ServiceImpl<TPProfessionalMapper, TPProfessional> implements TPProfessionalService {
-
-    @Resource
-    private TPRequirementService tpRequirementService;
-    @Resource
-    private BasicRoleDataPermissionService basicRoleDataPermissionService;
-
-    @Override
-    public IPage<ProfessionalDto> pageData(Page<ProfessionalDto> page, String name, Long orgId) {
-        Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
-        SysUser requestUser = (SysUser) ServletUtil.getRequestUser();
-        DataPermissionRule dpr = basicRoleDataPermissionService.findDataPermission(schoolId, requestUser.getId(), ServletUtil.getRequest().getServletPath());
-        return this.baseMapper.pageData(page, schoolId, name, orgId, dpr);
-    }
-
-    @Transactional
-    @Override
-    public Boolean saveData(TPProfessional tpProfessional) {
-        SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
-        tpProfessional.insertInfo(sysUser.getId());
-        tpProfessional.setSchoolId(sysUser.getSchoolId());
-        this.save(tpProfessional);
-
-        List<TPRequirement> tpRequirementList = new ArrayList<>();
-        // 新增默认毕业要求
-        ProfessionalCertificationEnum.listTypes().forEach(m -> {
-            TPRequirement tpRequirement = new TPRequirement();
-            tpRequirement.setProfessionalId(tpProfessional.getId());
-            tpRequirement.setCode(m.getCode());
-            tpRequirement.setName(m.getName());
-            tpRequirement.setSortNum(m.getOrdinal() + 1);
-            tpRequirement.insertInfo(sysUser.getId());
-            tpRequirementList.add(tpRequirement);
-        });
-        tpRequirementService.saveBatch(tpRequirementList);
-        return true;
-    }
-}

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

@@ -1,111 +0,0 @@
-package com.qmth.distributed.print.business.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.qmth.distributed.print.business.bean.dto.professional.MatrixDto;
-import com.qmth.distributed.print.business.entity.TPCourse;
-import com.qmth.distributed.print.business.entity.TPMatrix;
-import com.qmth.distributed.print.business.entity.TPRequirement;
-import com.qmth.distributed.print.business.mapper.TPRequirementMapper;
-import com.qmth.distributed.print.business.service.TPCourseService;
-import com.qmth.distributed.print.business.service.TPMatrixService;
-import com.qmth.distributed.print.business.service.TPRequirementService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.qmth.teachcloud.common.entity.SysUser;
-import com.qmth.teachcloud.common.util.ServletUtil;
-import org.activiti.bpmn.converter.export.CollaborationExport;
-import org.apache.commons.collections4.CollectionUtils;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * <p>
- * 专业认证毕业要求 服务实现类
- * </p>
- *
- * @author xf
- * @since 2024-04-22
- */
-@Service
-public class TPRequirementServiceImpl extends ServiceImpl<TPRequirementMapper, TPRequirement> implements TPRequirementService {
-
-    @Resource
-    private TPCourseService tpCourseService;
-    @Resource
-    private TPMatrixService tpMatrixService;
-
-    @Override
-    public List<TPRequirement> listRequirement(Long professionalId) {
-        QueryWrapper<TPRequirement> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(TPRequirement::getProfessionalId, professionalId)
-                .orderByAsc(TPRequirement::getSortNum);
-        return this.list(queryWrapper);
-    }
-
-    @Transactional
-    @Override
-    public boolean saveRequirement(TPRequirement tpRequirement) {
-        SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
-        // 修改
-        if (tpRequirement.getId() != null) {
-            if(tpRequirement.getNodeCount() == null){
-                tpRequirement.setNodeCount(null);
-            } else {
-                tpRequirement.setNodeCount(tpRequirement.getNodeCount() == 0 ? null : tpRequirement.getNodeCount());
-            }
-            tpRequirement.updateInfo(sysUser.getId());
-        }
-        // 新增
-        else {
-            tpRequirement.setSortNum(this.getMaxSortNum(tpRequirement.getProfessionalId()) + 1);
-            tpRequirement.insertInfo(sysUser.getId());
-        }
-        this.saveOrUpdate(tpRequirement);
-        // 节点数变动后，修改矩阵数据
-        List<TPCourse> tpCourseList = tpCourseService.listCourse(tpRequirement.getProfessionalId());
-        if (CollectionUtils.isNotEmpty(tpCourseList)) {
-            for (TPCourse tpCourse : tpCourseList) {
-                tpMatrixService.updateMatrixForNodeCount(tpCourse, tpRequirement);
-            }
-        }
-        return true;
-    }
-
-    @Override
-    public boolean saveSort(List<TPRequirement> requirementList) {
-        requirementList.forEach(t -> {
-            if (t.getId() != null && t.getSortNum() != null) {
-                UpdateWrapper<TPRequirement> updateWrapper = new UpdateWrapper();
-                updateWrapper.lambda().set(TPRequirement::getSortNum, t.getSortNum())
-                        .eq(TPRequirement::getId, t.getId());
-                this.update(updateWrapper);
-            }
-        });
-        return true;
-    }
-
-    @Transactional
-    @Override
-    public boolean removeRequirement(Long id) {
-        tpMatrixService.removeMatrixByCondition(null, null, id);
-        return this.removeById(id);
-    }
-
-    @Override
-    public int getMaxSortNum(Long professionalId) {
-        QueryWrapper<TPRequirement> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(TPRequirement::getProfessionalId, professionalId)
-                .orderByDesc(TPRequirement::getSortNum)
-                .last("limit 1");
-        TPRequirement requirement = this.getOne(queryWrapper);
-        if (requirement == null) {
-            return 0;
-        } else {
-            return requirement.getSortNum();
-        }
-    }
-}

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

@@ -1,305 +0,0 @@
-package com.qmth.distributed.print.business.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.qmth.distributed.print.business.bean.dto.report.*;
-import com.qmth.distributed.print.business.bean.result.FinalScoreResult;
-import com.qmth.distributed.print.business.entity.TRBasicInfo;
-import com.qmth.distributed.print.business.entity.TRExamStudent;
-import com.qmth.distributed.print.business.mapper.TRExamStudentMapper;
-import com.qmth.distributed.print.business.service.TRBasicInfoService;
-import com.qmth.distributed.print.business.service.TRExamStudentService;
-import com.qmth.teachcloud.common.contant.SystemConstant;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.CollectionUtils;
-
-import javax.annotation.Resource;
-import java.math.BigDecimal;
-import java.util.*;
-import java.util.concurrent.atomic.AtomicReference;
-import java.util.stream.Collectors;
-
-/**
- * <p>
- * 报告考生表 服务实现类
- * </p>
- *
- * @author wangliang
- * @since 2024-02-18
- */
-@Service
-public class TRExamStudentServiceImpl extends ServiceImpl<TRExamStudentMapper, TRExamStudent> implements TRExamStudentService {
-    private final static Logger log = LoggerFactory.getLogger(TRExamStudentServiceImpl.class);
-
-    @Resource
-    TRExamStudentService trExamStudentService;
-
-    @Resource
-    TRBasicInfoService trBasicInfoService;
-
-    /**
-     * 获取考生详细报告
-     *
-     * @param trBasicInfo
-     * @param paramsMap
-     * @return
-     */
-    @Override
-    @Transactional
-    public List<ReportExamStudentDto> getExamStudentReportDetail(TRBasicInfo trBasicInfo, Map<String, Object> paramsMap) {
-        List<ReportExamStudentDto> examStudentList = (List<ReportExamStudentDto>) paramsMap.get("examStudentList");
-//        Map<String, Map<Long, Map<Long, DimensionDto>>> finalScoreExamStudentDimensionMap = (Map<String, Map<Long, Map<Long, DimensionDto>>>) paramsMap.get("finalScoreExamStudentDimensionMap");
-        Map<String, FinalScoreResult> finalScoreResultMap = (Map<String, FinalScoreResult>) paramsMap.get("finalScoreResultMap");
-        Map<String, Map<Long, Double>> finalScoreExamStudentTargetMap = (Map<String, Map<Long, Double>>) paramsMap.get("finalScoreExamStudentTargetMap");
-        Map<Long, CourseTargetWordDto> targetWordMap = (Map<Long, CourseTargetWordDto>) paramsMap.get("targetWordMap");
-        if (!CollectionUtils.isEmpty(examStudentList)) {
-            List<TRExamStudent> trExamStudentList = new ArrayList<>(examStudentList.size());
-            Map<Long, ReportExamStudentTargetDto> reportExamStudentTargetDtoMap = new LinkedHashMap<>();
-            for (ReportExamStudentDto reportExamStudentDto : examStudentList) {
-//                Map<Long, Map<Long, DimensionDto>> map = finalScoreExamStudentDimensionMap.get(reportExamStudentDto.getStudentCode());
-                Map<Long, Double> map = finalScoreExamStudentTargetMap.get(reportExamStudentDto.getStudentCode());
-                FinalScoreResult finalScoreResult = finalScoreResultMap.get(reportExamStudentDto.getStudentCode());
-                ReportExamStudentUsualScoreDto reportExamStudentUsualScoreSumDto = finalScoreResult.getUsualScoreDto();
-                map.forEach((k, v) -> {
-                    List<ReportExamStudentTargetDto> targetList = CollectionUtils.isEmpty(reportExamStudentDto.getTargetList()) ? new ArrayList<>() : reportExamStudentDto.getTargetList();
-                    if (targetWordMap.containsKey(k)) {
-                        List<ReportExamStudentUsualScoreObjDto> scoreObjDtoList = reportExamStudentUsualScoreSumDto.getScoreMap().get(k);
-                        if (!CollectionUtils.isEmpty(scoreObjDtoList)) {
-                            CourseTargetWordDto courseTargetWordDto = targetWordMap.get(k);
-                            ReportExamStudentFinalScoreDto reportExamStudentFinalScoreDto = new ReportExamStudentFinalScoreDto(courseTargetWordDto.getFinalScoreDto(), finalScoreResult.getFinalScoreTarget().get(k));
-                            ReportExamStudentUsualScoreDto reportExamStudentUsualScoreDto = new ReportExamStudentUsualScoreDto(courseTargetWordDto.getUsualScoreDto().getUsualScoreTargetSumWeight(), scoreObjDtoList);
-
-                            BigDecimal targetMatrixSumScore = new BigDecimal(0);
-                            if (!reportExamStudentTargetDtoMap.containsKey(k)) {
-                                Double targetMatrixScore = new BigDecimal(v).multiply(courseTargetWordDto.getFinalScoreDto().getFinalScoreSumWeight()).divide(SystemConstant.PERCENT, 2, BigDecimal.ROUND_HALF_UP).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue();
-                                targetMatrixSumScore = targetMatrixSumScore.add(new BigDecimal(targetMatrixScore)).setScale(2, BigDecimal.ROUND_HALF_UP);
-                                reportExamStudentDto.setScore(reportExamStudentDto.getScore() + targetMatrixScore);
-                                //平时作业总和+累加
-                                Double usualMatrixSumScore = scoreObjDtoList.stream().mapToDouble(ReportExamStudentUsualScoreObjDto::getMatrixScore).sum();
-                                reportExamStudentDto.setScore(reportExamStudentDto.getScore() + usualMatrixSumScore);
-                                reportExamStudentFinalScoreDto.setTargetMatrixSumScore(targetMatrixSumScore.doubleValue());
-                                ReportExamStudentFinalScoreDto reportExamStudentFinalScoreTempDto = new ReportExamStudentFinalScoreDto(courseTargetWordDto.getFinalScoreDto(), targetMatrixSumScore.doubleValue(), finalScoreResult.getFinalScoreTarget().get(k));
-                                ReportExamStudentTargetDto reportExamStudentTargetDto = new ReportExamStudentTargetDto(courseTargetWordDto, reportExamStudentFinalScoreTempDto, new ReportExamStudentUsualScoreDto(courseTargetWordDto.getUsualScoreDto().getUsualScoreTargetSumWeight(), scoreObjDtoList.stream().map(ReportExamStudentUsualScoreObjDto::new).collect(Collectors.toList())));
-                                reportExamStudentTargetDtoMap.put(k, reportExamStudentTargetDto);
-                            } else {
-                                ReportExamStudentTargetDto reportExamStudentTargetDto = reportExamStudentTargetDtoMap.get(k);
-                                ReportExamStudentFinalScoreDto reportExamStudentFinalScoreAvgDto = reportExamStudentTargetDto.getFinalScore();
-                                Double targetMatrixScore = new BigDecimal(v).multiply(courseTargetWordDto.getFinalScoreDto().getFinalScoreSumWeight()).divide(SystemConstant.PERCENT, 2, BigDecimal.ROUND_HALF_UP).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue();
-                                targetMatrixSumScore = targetMatrixSumScore.add(new BigDecimal(targetMatrixScore)).setScale(2, BigDecimal.ROUND_HALF_UP);
-                                reportExamStudentDto.setScore(reportExamStudentDto.getScore() + targetMatrixScore);
-
-                                reportExamStudentFinalScoreDto.setTargetMatrixSumScore(targetMatrixSumScore.doubleValue());
-                                reportExamStudentFinalScoreAvgDto.setTargetMatrixSumScore(new BigDecimal(reportExamStudentFinalScoreAvgDto.getTargetMatrixSumScore()).add(targetMatrixSumScore).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
-                                ReportExamStudentUsualScoreDto reportExamStudentUsualScoreAvgDto = reportExamStudentTargetDto.getUsualScore();
-
-                                //平时作业总和+累加
-                                List<ReportExamStudentUsualScoreObjDto> reportExamStudentUsualScoreObjDtoList = reportExamStudentUsualScoreDto.getScoreList();
-                                List<ReportExamStudentUsualScoreObjDto> reportExamStudentUsualScoreObjAvgDtoList = reportExamStudentUsualScoreAvgDto.getScoreList();
-                                for (int i = 0; i < reportExamStudentUsualScoreObjDtoList.size(); i++) {
-                                    ReportExamStudentUsualScoreObjDto reportExamStudentUsualScoreObjDto = reportExamStudentUsualScoreObjDtoList.get(i);
-                                    reportExamStudentDto.setScore(reportExamStudentDto.getScore() + reportExamStudentUsualScoreObjDto.getMatrixScore());
-                                    reportExamStudentUsualScoreObjAvgDtoList.get(i).setMatrixScore(new BigDecimal(reportExamStudentUsualScoreObjAvgDtoList.get(i).getMatrixScore()).add(new BigDecimal(reportExamStudentUsualScoreObjDto.getMatrixScore())).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
-                                }
-                                reportExamStudentTargetDtoMap.put(k, reportExamStudentTargetDto);
-                            }
-                            targetList.add(new ReportExamStudentTargetDto(courseTargetWordDto, reportExamStudentFinalScoreDto, reportExamStudentUsualScoreDto));
-                        }
-                    }
-                    reportExamStudentDto.setTargetList(targetList);
-                });
-                reportExamStudentDto.setScore(new BigDecimal(reportExamStudentDto.getScore()).setScale(0, BigDecimal.ROUND_DOWN).doubleValue());
-                Collections.sort(reportExamStudentDto.getTargetList());
-                trExamStudentList.add(new TRExamStudent(trBasicInfo.getId(), reportExamStudentDto));
-            }
-            //加入目标分&平均分&各课程目标平均分
-            BigDecimal size = new BigDecimal(examStudentList.size());
-            List<ReportExamStudentTargetDto> targetDtoList = this.targetDtoParams(reportExamStudentTargetDtoMap, size);
-            AtomicReference<Double> targetScoreSum = new AtomicReference<>(0.0d);
-            AtomicReference<Double> usualScoreSum = new AtomicReference<>(0.0d);
-            targetDtoList.stream().peek(e -> {
-                targetScoreSum.set(targetScoreSum.get() + e.getFinalScore().getMatrixAvgScore());
-                usualScoreSum.set(usualScoreSum.get() + e.getUsualScore().getScoreList().stream().mapToDouble(ReportExamStudentUsualScoreObjDto::getMatrixAvgScore).sum());
-            }).collect(Collectors.toList());
-
-            Double score = new BigDecimal(targetScoreSum.get()).add(new BigDecimal(usualScoreSum.get())).setScale(1, BigDecimal.ROUND_DOWN).doubleValue();
-            ReportExamStudentDto reportExamStudentTargetDto = new ReportExamStudentDto("目标分", "目标分", null, 100.d, targetDtoList);
-            ReportExamStudentDto reportExamStudentAvgDto = new ReportExamStudentDto("平均分", "平均分", null, score, targetDtoList);
-            ReportExamStudentDto reportExamStudentTargetAvgDto = new ReportExamStudentDto("各课程目标平均分", "各课程目标平均分", null, null, targetDtoList);
-
-            examStudentList.addAll(Arrays.asList(reportExamStudentTargetDto, reportExamStudentAvgDto, reportExamStudentTargetAvgDto));
-            trExamStudentList.addAll(Arrays.asList(new TRExamStudent(trBasicInfo.getId(), reportExamStudentTargetDto), new TRExamStudent(trBasicInfo.getId(), reportExamStudentAvgDto), new TRExamStudent(trBasicInfo.getId(), reportExamStudentTargetAvgDto)));
-            this.remove(new QueryWrapper<TRExamStudent>().lambda().eq(TRExamStudent::getrBasicInfoId, trBasicInfo.getId()));
-            this.saveBatch(trExamStudentList);
-        }
-        return examStudentList;
-    }
-
-    /**
-     * 根据报告id删除数据
-     *
-     * @param rBasicInfoId
-     * @return
-     */
-    @Override
-    @Transactional
-    public Boolean remove(Long rBasicInfoId) {
-        return trExamStudentService.remove(new QueryWrapper<TRExamStudent>().lambda().eq(TRExamStudent::getrBasicInfoId, rBasicInfoId));
-    }
-
-    /**
-     * 根据考试id/课程编码/试卷编码删除数据
-     *
-     * @param examId
-     * @param courseCode
-     * @param paperNumber
-     * @param teachCourseId
-     * @return
-     */
-    @Override
-    @Transactional
-    public Boolean remove(Long examId, Long courseId, String paperNumber, Long teachCourseId) {
-        TRBasicInfo trBasicInfo = trBasicInfoService.queryBasicInfo(examId, courseId, paperNumber, teachCourseId);
-        return Objects.nonNull(trBasicInfo) ? trExamStudentService.remove(trBasicInfo.getId()) : false;
-    }
-
-    /**
-     * 知识点纬度数据构建
-     *
-     * @param map
-     * @param targetWordMap
-     * @param reportExamStudentDto
-     * @param reportExamStudentUsualScoreSumDto
-     * @param reportExamStudentTargetDtoMap
-     * @param finalScoreResult
-     */
-    protected void dimensionDataBuild(Map<Long, Map<Long, DimensionDto>> map, Map<Long, CourseTargetWordDto> targetWordMap,
-                                      ReportExamStudentDto reportExamStudentDto, ReportExamStudentUsualScoreDto reportExamStudentUsualScoreSumDto,
-                                      Map<Long, ReportExamStudentTargetDto> reportExamStudentTargetDtoMap, FinalScoreResult finalScoreResult) {
-        //课程目标循环
-        map.forEach((k, v) -> {
-            List<DimensionDto> dimensionDtoList = new ArrayList<>(v.values());
-            Collections.sort(dimensionDtoList);
-            List<ReportExamStudentTargetDto> targetList = CollectionUtils.isEmpty(reportExamStudentDto.getTargetList()) ? new ArrayList<>() : reportExamStudentDto.getTargetList();
-            if (targetWordMap.containsKey(k)) {
-                List<ReportExamStudentUsualScoreObjDto> scoreObjDtoList = reportExamStudentUsualScoreSumDto.getScoreMap().get(k);
-                CourseTargetWordDto courseTargetWordDto = targetWordMap.get(k);
-                ReportExamStudentFinalScoreDto reportExamStudentFinalScoreDto = new ReportExamStudentFinalScoreDto(courseTargetWordDto.getFinalScoreDto(), dimensionDtoList, finalScoreResult.getFinalScoreDimension().get(k));
-                ReportExamStudentUsualScoreDto reportExamStudentUsualScoreDto = new ReportExamStudentUsualScoreDto(courseTargetWordDto.getUsualScoreDto().getUsualScoreTargetSumWeight(), scoreObjDtoList);
-
-                BigDecimal dimensionMatrixSumScore = new BigDecimal(0);
-                if (!reportExamStudentTargetDtoMap.containsKey(k)) {
-                    //各知识点转换分数
-                    for (DimensionDto dimensionDto : dimensionDtoList) {
-                        Double matrixScore = new BigDecimal(dimensionDto.getDimensionScore()).multiply(courseTargetWordDto.getFinalScoreDto().getFinalScoreSumWeight()).divide(SystemConstant.PERCENT, 2, BigDecimal.ROUND_HALF_UP).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue();
-                        dimensionDto.setDimensionMatrixScore(matrixScore);
-                        dimensionMatrixSumScore = dimensionMatrixSumScore.add(new BigDecimal(matrixScore)).setScale(2, BigDecimal.ROUND_HALF_UP);
-                        reportExamStudentDto.setScore(reportExamStudentDto.getScore() + matrixScore);
-                    }
-                    //平时作业总和+累加
-                    Double usualMatrixSumScore = scoreObjDtoList.stream().mapToDouble(ReportExamStudentUsualScoreObjDto::getMatrixScore).sum();
-                    reportExamStudentDto.setScore(reportExamStudentDto.getScore() + usualMatrixSumScore);
-                    reportExamStudentFinalScoreDto.setTargetDimensionMatrixSumScore(dimensionMatrixSumScore.doubleValue());
-                    ReportExamStudentFinalScoreDto reportExamStudentFinalScoreTempDto = new ReportExamStudentFinalScoreDto(courseTargetWordDto.getFinalScoreDto(), dimensionDtoList.stream().map(DimensionDto::new).collect(Collectors.toList()), dimensionMatrixSumScore.doubleValue(), finalScoreResult.getFinalScoreDimension().get(k));
-                    ReportExamStudentTargetDto reportExamStudentTargetDto = new ReportExamStudentTargetDto(courseTargetWordDto, reportExamStudentFinalScoreTempDto, new ReportExamStudentUsualScoreDto(courseTargetWordDto.getUsualScoreDto().getUsualScoreTargetSumWeight(), scoreObjDtoList.stream().map(ReportExamStudentUsualScoreObjDto::new).collect(Collectors.toList())));
-                    reportExamStudentTargetDtoMap.put(k, reportExamStudentTargetDto);
-                } else {
-                    ReportExamStudentTargetDto reportExamStudentTargetDto = reportExamStudentTargetDtoMap.get(k);
-                    ReportExamStudentFinalScoreDto reportExamStudentFinalScoreAvgDto = reportExamStudentTargetDto.getFinalScore();
-                    List<DimensionDto> dimensionDtos = reportExamStudentFinalScoreAvgDto.getDimensionList();
-                    //各知识点转换分数
-                    for (int i = 0; i < dimensionDtoList.size(); i++) {
-                        DimensionDto dimensionDto = dimensionDtoList.get(i);
-                        Double matrixScore = new BigDecimal(dimensionDto.getDimensionScore()).multiply(courseTargetWordDto.getFinalScoreDto().getFinalScoreSumWeight()).divide(SystemConstant.PERCENT, 2, BigDecimal.ROUND_HALF_UP).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue();
-                        dimensionDto.setDimensionMatrixScore(matrixScore);
-                        reportExamStudentDto.setScore(reportExamStudentDto.getScore() + matrixScore);
-                        dimensionDtos.get(i).setDimensionMatrixScore(dimensionDtos.get(i).getDimensionMatrixScore() + matrixScore);
-                        dimensionMatrixSumScore = dimensionMatrixSumScore.add(new BigDecimal(matrixScore)).setScale(2, BigDecimal.ROUND_HALF_UP);
-                    }
-                    reportExamStudentFinalScoreDto.setTargetDimensionMatrixSumScore(dimensionMatrixSumScore.doubleValue());
-                    reportExamStudentFinalScoreAvgDto.setTargetDimensionMatrixSumScore(new BigDecimal(reportExamStudentFinalScoreAvgDto.getTargetDimensionMatrixSumScore()).add(dimensionMatrixSumScore).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
-                    ReportExamStudentUsualScoreDto reportExamStudentUsualScoreAvgDto = reportExamStudentTargetDto.getUsualScore();
-
-                    //平时作业总和+累加
-                    List<ReportExamStudentUsualScoreObjDto> reportExamStudentUsualScoreObjDtoList = reportExamStudentUsualScoreDto.getScoreList();
-                    List<ReportExamStudentUsualScoreObjDto> reportExamStudentUsualScoreObjAvgDtoList = reportExamStudentUsualScoreAvgDto.getScoreList();
-                    for (int i = 0; i < reportExamStudentUsualScoreObjDtoList.size(); i++) {
-                        ReportExamStudentUsualScoreObjDto reportExamStudentUsualScoreObjDto = reportExamStudentUsualScoreObjDtoList.get(i);
-                        reportExamStudentDto.setScore(reportExamStudentDto.getScore() + reportExamStudentUsualScoreObjDto.getMatrixScore());
-                        reportExamStudentUsualScoreObjAvgDtoList.get(i).setMatrixScore(new BigDecimal(reportExamStudentUsualScoreObjAvgDtoList.get(i).getMatrixScore()).add(new BigDecimal(reportExamStudentUsualScoreObjDto.getMatrixScore())).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
-                    }
-                    reportExamStudentTargetDtoMap.put(k, reportExamStudentTargetDto);
-                }
-                targetList.add(new ReportExamStudentTargetDto(courseTargetWordDto, reportExamStudentFinalScoreDto, reportExamStudentUsualScoreDto));
-            }
-            reportExamStudentDto.setTargetList(targetList);
-        });
-    }
-
-    /**
-     * 处理目标分&平均分&各课程目标平均分参数-知识点纬度
-     *
-     * @param reportExamStudentTargetDtoMap
-     * @param size
-     * @return
-     */
-    protected List<ReportExamStudentTargetDto> targetDimensionDtoParams(Map<Long, ReportExamStudentTargetDto> reportExamStudentTargetDtoMap, BigDecimal size) {
-        List<ReportExamStudentTargetDto> targetDtoList = new ArrayList<>();
-        reportExamStudentTargetDtoMap.forEach((k, v) -> {
-            ReportExamStudentFinalScoreDto reportExamStudentFinalScoreDto = v.getFinalScore();//课程目标考核要素的平均分
-            BigDecimal matrixAvgScore = new BigDecimal(reportExamStudentFinalScoreDto.getTargetDimensionMatrixSumScore()).divide(size, 2, BigDecimal.ROUND_HALF_UP).setScale(2, BigDecimal.ROUND_HALF_UP);
-//            //如果换算出来的知识点总分超过了期末考试目标分，则
-//            if (reportExamStudentFinalScoreDto.getTargetScore().compareTo(matrixAvgScore) == -1) {
-//                throw ExceptionResultEnum.ERROR.exception("[" + v.getTargetName() + "]知识点总平均分超过了期末考试目标分，请重新设置知识点");
-//            }
-            reportExamStudentFinalScoreDto.setMatrixAvgScore(matrixAvgScore.doubleValue());
-
-            List<DimensionDto> dimensionDtoList = reportExamStudentFinalScoreDto.getDimensionList();
-            for (DimensionDto d : dimensionDtoList) {
-                d.setDimensionMatrixAvgScore(new BigDecimal(d.getDimensionMatrixScore()).divide(size, 2, BigDecimal.ROUND_HALF_UP).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
-            }
-
-            v.setTargetMatrixAvgScore(reportExamStudentFinalScoreDto.getMatrixAvgScore());
-            ReportExamStudentUsualScoreDto reportExamStudentUsualScoreDto = v.getUsualScore();
-            List<ReportExamStudentUsualScoreObjDto> reportExamStudentUsualScoreObjDtoList = reportExamStudentUsualScoreDto.getScoreList();
-            for (ReportExamStudentUsualScoreObjDto r : reportExamStudentUsualScoreObjDtoList) {
-                r.setMatrixAvgScore(new BigDecimal(r.getMatrixScore()).divide(size, 2, BigDecimal.ROUND_HALF_UP).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
-                v.setTargetMatrixAvgScore(v.getTargetMatrixAvgScore() + r.getMatrixAvgScore());
-            }
-            v.setTargetMatrixAvgScore(new BigDecimal(v.getTargetMatrixAvgScore()).setScale(1, BigDecimal.ROUND_DOWN).doubleValue());
-            targetDtoList.add(v);
-        });
-        Collections.sort(targetDtoList);
-        return targetDtoList;
-    }
-
-    /**
-     * 处理目标分&平均分&各课程目标平均分参数-课程目标纬度
-     *
-     * @param reportExamStudentTargetDtoMap
-     * @param size
-     * @return
-     */
-    protected List<ReportExamStudentTargetDto> targetDtoParams(Map<Long, ReportExamStudentTargetDto> reportExamStudentTargetDtoMap, BigDecimal size) {
-        List<ReportExamStudentTargetDto> targetDtoList = new ArrayList<>();
-        reportExamStudentTargetDtoMap.forEach((k, v) -> {
-            ReportExamStudentFinalScoreDto reportExamStudentFinalScoreDto = v.getFinalScore();//课程目标考核要素的平均分
-            BigDecimal matrixAvgScore = new BigDecimal(reportExamStudentFinalScoreDto.getTargetMatrixSumScore()).divide(size, 2, BigDecimal.ROUND_HALF_UP).setScale(2, BigDecimal.ROUND_HALF_UP);
-            reportExamStudentFinalScoreDto.setMatrixAvgScore(matrixAvgScore.doubleValue());
-
-            v.setTargetMatrixAvgScore(reportExamStudentFinalScoreDto.getMatrixAvgScore());
-            ReportExamStudentUsualScoreDto reportExamStudentUsualScoreDto = v.getUsualScore();
-            List<ReportExamStudentUsualScoreObjDto> reportExamStudentUsualScoreObjDtoList = reportExamStudentUsualScoreDto.getScoreList();
-            for (ReportExamStudentUsualScoreObjDto r : reportExamStudentUsualScoreObjDtoList) {
-                r.setMatrixAvgScore(new BigDecimal(r.getMatrixScore()).divide(size, 2, BigDecimal.ROUND_HALF_UP).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
-                v.setTargetMatrixAvgScore(v.getTargetMatrixAvgScore() + r.getMatrixAvgScore());
-            }
-            v.setTargetMatrixAvgScore(new BigDecimal(v.getTargetMatrixAvgScore()).setScale(1, BigDecimal.ROUND_DOWN).doubleValue());
-            targetDtoList.add(v);
-        });
-        Collections.sort(targetDtoList);
-        return targetDtoList;
-    }
-}

distributed-print-business/src/main/java/com/qmth/distributed/print/business/util/PdfUtil.java

@@ -1,10 +1,9 @@
 package com.qmth.distributed.print.business.util;
 
 import com.itextpdf.awt.AsianFontMapper;
-import com.itextpdf.text.*;
 import com.itextpdf.text.Rectangle;
+import com.itextpdf.text.*;
 import com.itextpdf.text.pdf.*;
-import com.qmth.boot.api.exception.ApiException;
 import com.qmth.boot.tools.models.ByteArray;
 import com.qmth.distributed.print.business.bean.dto.PdfDto;
 import com.qmth.teachcloud.common.config.DictionaryConfig;
@@ -17,8 +16,6 @@ import com.qmth.teachcloud.common.enums.UploadFileEnum;
 import com.qmth.teachcloud.common.service.CommonCacheService;
 import com.qmth.teachcloud.common.util.FileUtil;
 import com.qmth.teachcloud.common.util.HtmlToPdfUtil;
-import com.qmth.teachcloud.common.util.ResultUtil;
-import jdk.internal.util.xml.impl.Input;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.io.IOUtils;
 import org.slf4j.Logger;
@@ -29,7 +26,6 @@ import org.springframework.util.FileCopyUtils;
 import javax.swing.*;
 import java.awt.*;
 import java.io.*;
-import java.nio.channels.Channels;
 import java.nio.charset.StandardCharsets;
 import java.util.List;
 import java.util.*;

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

@@ -3,7 +3,7 @@
 <mapper namespace="com.qmth.distributed.print.business.mapper.ExamTaskPaperDataMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.qmth.teachcloud.common.entity.ExamTaskPaperData">
+    <resultMap id="BaseResultMap" type="com.qmth.distributed.print.business.entity.ExamTaskPaperData">
         <id column="exam_id" property="examId" />
         <id column="paper_number" property="paperNumber" />
         <id column="paper_id" property="paperId" />

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

@@ -1,95 +0,0 @@
-<?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.TCFinalScoreMapper">
-
-    <select id="finalScoreList" resultType="com.qmth.distributed.print.business.entity.TCFinalScore">
-        select * from t_c_final_score t
-        <where>
-            <if test="examId != null and examId != ''">
-                and t.exam_id = #{examId}
-            </if>
-            <if test="courseId != null">
-                and t.course_id = #{courseId}
-            </if>
-            <if test="paperNumber != null and paperNumber != ''">
-                and t.paper_number = #{paperNumber}
-            </if>
-            <if test="teachCourseId != null and teachCourseId != ''">
-                and t.teach_course_id = #{teachCourseId}
-            </if>
-        </where>
-        order by t.student_code
-    </select>
-
-    <select id="finalScoreScoreOverView" resultType="com.qmth.distributed.print.business.bean.dto.FinalScoreDto">
-        select count(1) as studentCount,
-            max(case when tcfs.score is not null then tcfs.score else null end) finalScoreMaxScore,
-            min(case when tcfs.score is not null then tcfs.score else null end) finalScoreMinScore,
-            avg(case when tcfs.score is not null then tcfs.score else null end) finalScoreAvgScore
-            from t_c_final_score tcfs
-            join t_c_usual_score tcus on tcfs.exam_id = tcus.exam_id and tcfs.course_id = tcus.course_id and tcfs.teach_course_id = tcus.teach_course_id and tcfs.student_code = tcus.student_code
-        <where>
-            <if test="examId != null and examId != ''">
-                and tcfs.exam_id = #{examId}
-            </if>
-            <if test="courseId != null">
-                and tcfs.course_id = #{courseId}
-            </if>
-            <if test="paperNumber != null and paperNumber != ''">
-                and tcfs.paper_number = #{paperNumber}
-            </if>
-            <if test="teachCourseId != null and teachCourseId != ''">
-                and tcfs.teach_course_id = #{teachCourseId}
-            </if>
-                and tcfs.enable = true and tcus.enable = true
-        </where>
-    </select>
-
-    <select id="getCountByScoreRange" resultType="int">
-        SELECT count(1) FROM t_c_final_score tcfs
-        <where>
-            <if test="examId != null and examId != ''">
-                and tcfs.exam_id = #{examId}
-            </if>
-            <if test="courseId != null">
-                and tcfs.course_id = #{courseId}
-            </if>
-            <if test="paperNumber != null and paperNumber != ''">
-                and tcfs.paper_number = #{paperNumber}
-            </if>
-            <if test="teachCourseId != null and teachCourseId != ''">
-                and tcfs.teach_course_id = #{teachCourseId}
-            </if>
-                and tcfs.score &gt;= #{start} and tcfs.score &lt;= #{end}
-                and tcfs.enable = true
-        </where>
-    </select>
-
-    <select id="examStudentOverview" resultType="com.qmth.distributed.print.business.bean.result.FinalScoreResult">
-        select
-            tcfs.name,
-            tcfs.student_code as studentCode,
-            tcfs.score_detail as finalScoreDetail,
-            tcus.score as usualScore,
-            es.teach_clazz_name as administrativeClass
-        from t_c_final_score tcfs
-        join t_c_usual_score tcus on tcfs.exam_id = tcus.exam_id and tcfs.course_id = tcus.course_id and tcfs.teach_course_id = tcus.teach_course_id and tcfs.student_code = tcus.student_code
-        left join exam_student es on es.exam_id = tcfs.exam_id and es.paper_number = tcfs.paper_number and es.student_code = tcfs.student_code
-        <where>
-            <if test="examId != null and examId != ''">
-                and tcfs.exam_id = #{examId}
-            </if>
-            <if test="courseId != null">
-                and tcfs.course_id = #{courseId}
-            </if>
-            <if test="paperNumber != null and paperNumber != ''">
-                and tcfs.paper_number = #{paperNumber}
-            </if>
-            <if test="teachCourseId != null and teachCourseId != ''">
-                and tcfs.teach_course_id = #{teachCourseId}
-            </if>
-                and tcfs.enable = true and tcus.enable = true
-        </where>
-            order by tcfs.student_code
-    </select>
-</mapper>

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

@@ -1,65 +0,0 @@
-<?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.TCUsualScoreMapper">
-
-    <select id="scoreList" resultType="com.qmth.distributed.print.business.bean.result.ScoreResult">
-        SELECT distinct
-                 bs.id as semesterId,
-                 tc.exam_id as examId,
-                 tc.course_id as courseId,
-                 bc.code as courseCode,
-                 bc.name as courseName,
-                 tc.id AS teachCourseId,
-                 creator.real_name AS userName,
-                 creator.login_name AS userLoginName
-        FROM
-            teach_course tc
-            left join basic_exam be on be.id = tc.exam_id
-            left join basic_semester bs on bs.id = be.semester_id
-            left join basic_course bc on tc.course_id = bc.id
-            left join sys_user su on tc.user_id = su.id
-            left join sys_user creator on creator.id = tc.user_id
-        <where>
-            <if test="examId != null and examId != ''">
-                and tc.exam_id = #{examId}
-            </if>
-            <if test="courseId != null">
-                and tc.course_id = #{courseId}
-            </if>
-            <if test="dpr != null">
-                <if test="dpr.requestUserId != null">
-                    AND tc.user_id = #{dpr.requestUserId}
-                </if>
-                <if test="dpr.courseUserId != null">
-                    AND tc.user_id = #{dpr.courseUserId}
-                </if>
-                <if test="dpr.orgIdSet != null and dpr.orgIdSet != '' and dpr.orgIdSet.size > 0">
-                    AND su.org_id IN
-                    <foreach collection="dpr.orgIdSet" item="item" index="index" open="(" separator="," close=")">
-                        #{item}
-                    </foreach>
-                </if>
-            </if>
-        </where>
-        ORDER BY bc.code
-    </select>
-
-    <select id="usualScoreList" resultType="com.qmth.distributed.print.business.entity.TCUsualScore">
-        select * from t_c_usual_score t
-        <where>
-            <if test="examId != null and examId != ''">
-                and t.exam_id = #{examId}
-            </if>
-            <if test="courseId != null">
-                and t.course_id = #{courseId}
-            </if>
-            <if test="paperNumber != null and paperNumber != ''">
-                and t.paper_number = #{paperNumber}
-            </if>
-            <if test="teachCourseId != null and teachCourseId != ''">
-                and t.teach_course_id = #{teachCourseId}
-            </if>
-        </where>
-        order by t.student_code
-    </select>
-</mapper>

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

@@ -1,50 +0,0 @@
-<?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.TPCourseMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.qmth.distributed.print.business.entity.TPCourse">
-        <id column="id" property="id" />
-        <result column="professional_id" property="professionalId" />
-        <result column="course_code" property="courseCode" />
-        <result column="course_name" property="courseName" />
-        <result column="sort_num" property="sortNum" />
-        <result column="create_id" property="createId" />
-        <result column="create_time" property="createTime" />
-        <result column="update_id" property="updateId" />
-        <result column="update_time" property="updateTime" />
-    </resultMap>
-    <select id="queryList"
-            resultType="com.qmth.distributed.print.business.bean.result.ProfessionalCourseSelectResult">
-        SELECT
-            bc.code courseCode,
-            bc.name courseName,
-            bc.teaching_room_id orgId,
-            so.name orgName,
-            CASE
-                WHEN tpc.id IS NULL THEN TRUE
-                ELSE FALSE
-                END canSelect
-        FROM
-            (SELECT
-                 *
-             FROM
-                 basic_course
-             WHERE
-                 teaching_room_id IN
-             <foreach collection="orgIdSet" item="orgId" separator="," open="(" close=")">
-                 #{orgId}
-             </foreach>
-             ) bc
-                LEFT JOIN
-            (SELECT
-                 *
-             FROM
-                 t_p_course
-             WHERE
-                 professional_id = #{professionalId}) tpc ON bc.code = tpc.course_code
-                LEFT JOIN
-            sys_org so ON bc.teaching_room_id = so.id
-    </select>
-
-</mapper>

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

@@ -1,34 +0,0 @@
-<?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.TPMatrixMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.qmth.distributed.print.business.entity.TPMatrix">
-        <id column="id" property="id" />
-        <result column="professional_id" property="professionalId" />
-        <result column="course_id" property="courseId" />
-        <result column="requirement_id" property="requirementId" />
-        <result column="sub_name" property="subName" />
-        <result column="content" property="content" />
-        <result column="create_id" property="createId" />
-        <result column="create_time" property="createTime" />
-        <result column="update_id" property="updateId" />
-        <result column="update_time" property="updateTime" />
-    </resultMap>
-    <select id="listMatrix" resultType="com.qmth.distributed.print.business.entity.TPMatrix">
-        SELECT
-            tpm.*,
-            tpc.sort_num courseSortNum,
-            tpr.sort_num requirementSortNum
-        FROM
-            t_p_matrix tpm
-                LEFT JOIN
-            t_p_course tpc ON tpm.course_id = tpc.id
-                LEFT JOIN
-            t_p_requirement tpr ON tpm.requirement_id = tpr.id
-        WHERE
-            tpm.professional_id = #{professionalId}
-        ORDER BY tpc.sort_num , tpr.sort_num
-    </select>
-
-</mapper>

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

@@ -1,57 +0,0 @@
-<?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.TPProfessionalMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.qmth.distributed.print.business.entity.TPProfessional">
-        <id column="id" property="id" />
-        <result column="school_id" property="schoolId" />
-        <result column="name" property="name" />
-        <result column="org_id" property="orgId" />
-        <result column="create_id" property="createId" />
-        <result column="create_time" property="createTime" />
-        <result column="update_id" property="updateId" />
-        <result column="update_time" property="updateTime" />
-    </resultMap>
-    <select id="pageData"
-            resultType="com.qmth.distributed.print.business.bean.dto.professional.ProfessionalDto">
-        select
-            tpp.id,
-            tpp.name,
-            tpp.org_id,
-            tpp.create_id,
-            tpp.create_time,
-            tpp.update_id,
-            tpp.update_time,
-            so.name orgName,
-            su.login_name loginName,
-            su.real_name userName
-        from t_p_professional tpp
-            left join sys_org so on tpp.org_id = so.id
-            left join sys_user su on tpp.create_id = su.id
-        <where>
-            <if test="schoolId != null">
-                and tpp.school_id = #{schoolId}
-            </if>
-            <if test="name != null and name != ''">
-                and tpp.name like concat('%',#{name},'%')
-            </if>
-            <if test="orgId != null">
-                and tpp.org_id = #{orgId}
-            </if>
-            <if test="dpr != null">
-                <if test="dpr.requestUserId != null">
-                    AND tpp.create_id = #{dpr.requestUserId}
-                    AND tpp.org_id = su.org_id
-                </if>
-                <if test="dpr.orgIdSet != null and dpr.orgIdSet != '' and dpr.orgIdSet.size > 0">
-                    AND tpp.org_id IN
-                    <foreach collection="dpr.orgIdSet" item="item" index="index" open="(" separator="," close=")">
-                        #{item}
-                    </foreach>
-                </if>
-            </if>
-        </where>
-    </select>
-
-</mapper>

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

@@ -1,19 +0,0 @@
-<?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.TPRequirementMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.qmth.distributed.print.business.entity.TPRequirement">
-        <id column="id" property="id" />
-        <result column="professional_id" property="professionalId" />
-        <result column="code" property="name" />
-        <result column="name" property="name" />
-        <result column="node_count" property="nodeCount" />
-        <result column="sort_num" property="sortNum" />
-        <result column="create_id" property="createId" />
-        <result column="create_time" property="createTime" />
-        <result column="update_id" property="updateId" />
-        <result column="update_time" property="updateTime" />
-    </resultMap>
-
-</mapper>

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

@@ -1,5 +0,0 @@
-<?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.TRExamStudentMapper">
-
-</mapper>

distributed-print/install/mysql/upgrade/3.4.0.sql

@@ -177,4 +177,733 @@ UPDATE `sys_privilege` SET `related` = '490,543,955,959,1139' WHERE (`id` = '488
 -- 升级说明
 -- 1. 将通用规则中，教学班改为teachClassName,班级改为className
 
---2024.06.24update*******************3.3.4->3.4.0升级脚本
+-- 2024.06.24update*******************3.3.4->3.4.0升级脚本
+/******************** Update Table: course_dimension ************************/
+
+/* Remove Indexes */
+DROP INDEX course_dimension_unique ON course_dimension;
+
+ALTER TABLE course_dimension DROP COLUMN teach_course_id;
+
+ALTER TABLE course_dimension DROP COLUMN semester_id;
+
+ALTER TABLE course_dimension DROP COLUMN exam_id;
+
+ALTER TABLE course_dimension DROP COLUMN course_id;
+
+ALTER TABLE course_dimension DROP COLUMN course_code;
+
+ALTER TABLE course_dimension DROP COLUMN user_id;
+
+ALTER TABLE course_dimension ADD obe_course_outline_id BIGINT
+    COMMENT '课程大纲id' NOT NULL after id;
+
+/* Add Indexes */
+CREATE UNIQUE INDEX course_dimension_unique ON course_dimension (obe_course_outline_id, source, code) USING BTREE;
+
+
+/******************** Update Table: course_evaluation ************************/
+
+ALTER TABLE course_evaluation CHANGE COLUMN course_code course_code VARCHAR(20)
+    COMMENT '课程编号' NULL;
+
+ALTER TABLE course_evaluation DROP COLUMN course_id;
+
+
+/******************** Update Table: course_target ************************/
+
+ALTER TABLE course_target CHANGE COLUMN course_code course_code VARCHAR(20)
+    COMMENT '课程编号' NULL;
+
+ALTER TABLE course_target DROP COLUMN course_id;
+
+
+/******************** Update Table: course_weight ************************/
+
+ALTER TABLE course_weight CHANGE COLUMN course_code course_code VARCHAR(20)
+    COMMENT '课程编号' NULL;
+
+ALTER TABLE course_weight DROP COLUMN course_id;
+
+/******************** Add Table: obe_course_dimension ************************/
+
+/* Build Table Structure */
+
+DROP TABLE IF EXISTS `obe_course_dimension`;
+CREATE TABLE obe_course_dimension
+(
+    id BIGINT
+        COMMENT 'id' NOT NULL,
+    obe_course_outline_id BIGINT
+        COMMENT '课程大纲id' NOT NULL,
+    school_id BIGINT
+        COMMENT '学校id' NOT NULL,
+    source VARCHAR(20)
+        COMMENT '来源' NOT NULL,
+    code VARCHAR(32)
+        COMMENT '知识点编号' NOT NULL,
+    name VARCHAR(255)
+        COMMENT '知识点名称' NOT NULL,
+    number INTEGER
+        COMMENT '排序' NOT NULL,
+    parent_id BIGINT
+        COMMENT '父id（顶级知识点父id为0）' NOT NULL,
+    create_id BIGINT
+        COMMENT '创建人' NULL,
+    create_time BIGINT
+        COMMENT '创建时间' NULL,
+    update_id BIGINT
+        COMMENT '更新人' NULL,
+    update_time BIGINT
+        COMMENT '更新时间' NULL
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='课程知识点表';
+
+/* Add Primary Key */
+ALTER TABLE obe_course_dimension ADD CONSTRAINT pkobe_course_dimension
+    PRIMARY KEY (id);
+
+/* Add Comments */
+ALTER TABLE obe_course_dimension COMMENT = '课程知识点表';
+
+/* Add Indexes */
+CREATE UNIQUE INDEX course_dimension_unique ON obe_course_dimension (obe_course_outline_id, source, code) USING BTREE;
+
+
+/******************** Add Table: obe_course_evaluation ************************/
+
+/* Build Table Structure */
+DROP TABLE IF EXISTS `obe_course_evaluation`;
+CREATE TABLE obe_course_evaluation
+(
+    id BIGINT
+        COMMENT 'id' NOT NULL,
+    obe_course_outline_id BIGINT
+        COMMENT '教学课程id' NOT NULL,
+    school_id BIGINT
+        COMMENT '学校id' NOT NULL,
+    type VARCHAR(20)
+        COMMENT '类型（默认DEFAULT、自定义CUSTOM）' NOT NULL,
+    evaluation VARCHAR(255)
+        COMMENT '评价方式' NOT NULL,
+    evaluation_desc VARCHAR(255)
+        COMMENT '评价方式描述' NULL,
+    create_id BIGINT
+        COMMENT '创建人id' NULL,
+    create_time BIGINT
+        COMMENT '创建时间' NULL,
+    update_id BIGINT
+        COMMENT '更新人id' NULL,
+    update_time BIGINT
+        COMMENT '更新时间' NULL
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='课程大纲评价方式表';
+
+/* Add Primary Key */
+ALTER TABLE obe_course_evaluation ADD CONSTRAINT pkobe_course_evaluation
+    PRIMARY KEY (id);
+
+/* Add Comments */
+ALTER TABLE obe_course_evaluation COMMENT = '课程大纲评价方式表';
+
+/* Add Indexes */
+CREATE UNIQUE INDEX course_evaluation_unique ON obe_course_evaluation (obe_course_outline_id, evaluation) USING BTREE;
+
+
+/******************** Add Table: obe_course_outline ************************/
+
+/* Build Table Structure */
+DROP TABLE IF EXISTS `obe_course_outline`;
+CREATE TABLE obe_course_outline
+(
+    id BIGINT
+        COMMENT '课程大纲表id' NOT NULL,
+    culture_program_id BIGINT
+        COMMENT '培养方案id' NOT NULL,
+    school_id BIGINT
+        COMMENT '学校id' NOT NULL,
+    name VARCHAR(255)
+        COMMENT '课程大纲名称' NOT NULL,
+    semester_id BIGINT
+        COMMENT '修读学期id' NOT NULL,
+    course_id BIGINT NOT NULL,
+    evaluation_mode VARCHAR(32)
+        COMMENT '考核方式' NOT NULL,
+    course_type VARCHAR(32)
+        COMMENT '课程类别' NOT NULL,
+    user_id BIGINT
+        COMMENT '课程大纲责任人' NOT NULL,
+    weight_setting TINYINT
+        COMMENT '权重设置' NULL,
+    weight_setting_sign BIGINT
+        COMMENT '课程权重设置标识' NULL,
+    dimension_sign BIGINT
+        COMMENT '知识点标识' NULL,
+    create_id BIGINT
+        COMMENT '创建人' NULL,
+    create_time BIGINT
+        COMMENT '创建时间' NULL,
+    update_id BIGINT
+        COMMENT '更新人' NULL,
+    update_time BIGINT
+        COMMENT '更新时间' NULL
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='课程大纲表';
+
+/* Add Primary Key */
+ALTER TABLE obe_course_outline ADD CONSTRAINT pkobe_course_outline
+    PRIMARY KEY (id);
+
+/* Add Comments */
+ALTER TABLE obe_course_outline COMMENT = '课程大纲表';
+
+/* Add Indexes */
+CREATE UNIQUE INDEX obe_course_outline_unique ON obe_course_outline (culture_program_id, name) USING BTREE;
+
+
+/******************** Add Table: obe_course_requirement_dimension ************************/
+
+/* Build Table Structure */
+DROP TABLE IF EXISTS `obe_course_requirement_dimension`;
+CREATE TABLE obe_course_requirement_dimension
+(
+    id BIGINT
+        COMMENT 'id' NOT NULL,
+    obe_course_outline_id BIGINT
+        COMMENT '课程大纲id' NOT NULL,
+    obe_culture_program_requirement_id BIGINT
+        COMMENT '指标id' NOT NULL,
+    obe_course_dimension_id BIGINT
+        COMMENT '知识点id' NOT NULL,
+    school_id BIGINT
+        COMMENT '学校id' NOT NULL,
+    create_id BIGINT
+        COMMENT '创建人' NULL,
+    create_time BIGINT
+        COMMENT '创建时间' NULL,
+    update_id BIGINT
+        COMMENT '更新人' NULL,
+    update_time BIGINT
+        COMMENT '更新时间' NULL
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='课程大纲指标与知识点关联表';
+
+/* Add Primary Key */
+ALTER TABLE obe_course_requirement_dimension ADD CONSTRAINT pkobe_course_requirement_dimension
+    PRIMARY KEY (id);
+
+/* Add Comments */
+ALTER TABLE obe_course_requirement_dimension COMMENT = '课程大纲指标与知识点关联表';
+
+/* Add Indexes */
+CREATE UNIQUE INDEX obe_course_requirement_dimension_unique ON obe_course_requirement_dimension (obe_course_outline_id, obe_culture_program_requirement_id, obe_course_dimension_id) USING BTREE;
+
+
+/******************** Add Table: obe_course_requirement_matrix ************************/
+
+/* Build Table Structure */
+DROP TABLE IF EXISTS `obe_course_requirement_matrix`;
+CREATE TABLE obe_course_requirement_matrix
+(
+    id BIGINT NOT NULL,
+    culture_program_id BIGINT
+        COMMENT '培养方案ID' NOT NULL,
+    obe_course_id BIGINT
+        COMMENT '专业认证课程ID' NOT NULL,
+    obe_requirement_id BIGINT
+        COMMENT '专业认证毕业要求ID' NOT NULL,
+    obe_sub_requirement_id BIGINT
+        COMMENT '子节点名称' NULL,
+    scale DOUBLE
+        COMMENT '指标值' NULL,
+    intensity VARCHAR(1)
+        COMMENT '强度' NULL,
+    create_id BIGINT
+        COMMENT '创建人ID' NULL,
+    create_time BIGINT
+        COMMENT '创建时间' NULL,
+    update_id BIGINT
+        COMMENT '更新人ID' NULL,
+    update_time BIGINT
+        COMMENT '更新时间' NULL
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='培养方案毕业要求支撑矩阵';
+
+/* Add Primary Key */
+ALTER TABLE obe_course_requirement_matrix ADD CONSTRAINT pkobe_course_requirement_matrix
+    PRIMARY KEY (id);
+
+/* Add Comments */
+ALTER TABLE obe_course_requirement_matrix COMMENT = '培养方案毕业要求支撑矩阵';
+
+/* Add Indexes */
+CREATE INDEX uq_professional_id ON obe_course_requirement_matrix (culture_program_id) USING BTREE;
+
+
+/******************** Add Table: obe_course_requirement_report ************************/
+
+/* Build Table Structure */
+DROP TABLE IF EXISTS `obe_course_requirement_report`;
+CREATE TABLE obe_course_requirement_report
+(
+    id BIGINT
+        COMMENT '主键' NOT NULL,
+    culture_program_id BIGINT UNIQUE
+        COMMENT '培养方案id' NOT NULL,
+    requirement_radar MEDIUMTEXT
+        COMMENT '毕业要求雷达报表' NOT NULL,
+    requirement_detail MEDIUMTEXT
+        COMMENT '毕业要求详情报表' NOT NULL,
+    requirement_degree DOUBLE
+        COMMENT '毕业要求达成值' NOT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='课程毕业要求报表';
+
+/* Add Primary Key */
+ALTER TABLE obe_course_requirement_report ADD CONSTRAINT pkobe_course_requirement_report
+    PRIMARY KEY (id);
+
+/* Add Comments */
+ALTER TABLE obe_course_requirement_report COMMENT = '课程毕业要求报表';
+
+/* Add Indexes */
+CREATE UNIQUE INDEX obe_course_requirement_report_unique ON obe_course_requirement_report (culture_program_id) USING BTREE;
+
+
+/******************** Add Table: obe_course_target ************************/
+
+/* Build Table Structure */
+DROP TABLE IF EXISTS `obe_course_target`;
+CREATE TABLE obe_course_target
+(
+    id BIGINT
+        COMMENT 'id' NOT NULL,
+    obe_course_outline_id BIGINT
+        COMMENT '教学课程id' NOT NULL,
+    obe_culture_program_requirement_id BIGINT
+        COMMENT '培养方案毕业要求指标点id' NULL,
+    school_id BIGINT
+        COMMENT '学校id' NOT NULL,
+    target_name VARCHAR(50)
+        COMMENT '课程目标' NULL,
+    degree_requirement VARCHAR(255)
+        COMMENT '毕业要求' NULL,
+    total_weight DECIMAL(6, 2)
+        COMMENT '课程目标整体权重' NULL,
+    expect_value DOUBLE
+        COMMENT '预期值' NULL,
+    create_id BIGINT
+        COMMENT '创建人' NULL,
+    create_time BIGINT
+        COMMENT '创建时间' NULL,
+    update_id BIGINT
+        COMMENT '更新人' NULL,
+    update_time BIGINT
+        COMMENT '更新时间' NULL
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='课程大纲目标表';
+
+/* Add Primary Key */
+ALTER TABLE obe_course_target ADD CONSTRAINT pkobe_course_target
+    PRIMARY KEY (id);
+
+/* Add Comments */
+ALTER TABLE obe_course_target COMMENT = '课程大纲目标表';
+
+/* Add Indexes */
+CREATE UNIQUE INDEX course_target_unique ON obe_course_target (obe_course_outline_id, target_name) USING BTREE;
+
+
+/******************** Add Table: obe_course_weight ************************/
+
+/* Build Table Structure */
+DROP TABLE IF EXISTS `obe_course_target`;
+CREATE TABLE obe_course_weight
+(
+    id BIGINT
+        COMMENT 'id' NOT NULL,
+    obe_course_outline_id BIGINT
+        COMMENT '课程大纲id' NOT NULL,
+    school_id BIGINT
+        COMMENT '学校id' NOT NULL,
+    target_id BIGINT
+        COMMENT '课程目标表id' NOT NULL,
+    evaluation_id BIGINT
+        COMMENT '课程评价表id' NOT NULL,
+    enable TINYINT DEFAULT 1
+        COMMENT '使用状态 1:使用 0:未使用' NOT NULL,
+    weight DECIMAL(6, 2)
+        COMMENT '权重' NULL,
+    target_score DECIMAL(6, 2)
+        COMMENT '目标分值' NULL,
+    create_id BIGINT
+        COMMENT '创建人' NULL,
+    create_time BIGINT
+        COMMENT '创建时间' NULL,
+    update_id BIGINT
+        COMMENT '更新人' NULL,
+    update_time BIGINT
+        COMMENT '更新时间' NULL
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='课程大纲权重设置表';
+
+/* Add Primary Key */
+ALTER TABLE obe_course_weight ADD CONSTRAINT pkobe_course_weight
+    PRIMARY KEY (id);
+
+/* Add Comments */
+ALTER TABLE obe_course_weight COMMENT = '课程大纲权重设置表';
+
+/* Add Indexes */
+CREATE UNIQUE INDEX course_weight_unique ON obe_course_weight (obe_course_outline_id, target_id, evaluation_id) USING BTREE;
+
+
+/******************** Add Table: obe_culture_program ************************/
+
+/* Build Table Structure */
+DROP TABLE IF EXISTS `obe_culture_program`;
+CREATE TABLE obe_culture_program
+(
+    id BIGINT NOT NULL,
+    school_id BIGINT
+        COMMENT '学校ID' NULL,
+    professional_id BIGINT
+        COMMENT '专业ID' NULL,
+    name VARCHAR(100)
+        COMMENT '培养方案名称' NULL,
+    target_count INTEGER DEFAULT 0
+        COMMENT '培养目标数量' NULL,
+    requirement_count INTEGER DEFAULT 0
+        COMMENT '毕业要求数量' NULL,
+    course_count INTEGER DEFAULT 0
+        COMMENT '课程体系数量' NULL,
+    description MEDIUMTEXT
+        COMMENT '总体描述' NULL,
+    expect_value DOUBLE NULL,
+    create_id BIGINT
+        COMMENT '创建人ID' NULL,
+    create_time BIGINT
+        COMMENT '创建时间' NULL,
+    update_id BIGINT
+        COMMENT '更新人ID' NULL,
+    update_time BIGINT
+        COMMENT '更新时间' NULL
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='培养方案';
+
+/* Add Primary Key */
+ALTER TABLE obe_culture_program ADD CONSTRAINT pkobe_culture_program
+    PRIMARY KEY (id);
+
+/* Add Comments */
+ALTER TABLE obe_culture_program COMMENT = '培养方案';
+
+/* Add Indexes */
+CREATE INDEX idx_1 ON obe_culture_program (professional_id, name) USING BTREE;
+
+
+/******************** Add Table: obe_culture_program_course ************************/
+
+/* Build Table Structure */
+DROP TABLE IF EXISTS `obe_culture_program_course`;
+CREATE TABLE obe_culture_program_course
+(
+    id BIGINT NOT NULL,
+    culture_program_id BIGINT
+        COMMENT '培养方案ID' NOT NULL,
+    course_id BIGINT
+        COMMENT '课程ID' NULL,
+    course_code VARCHAR(45)
+        COMMENT '课程代码' NULL,
+    course_name VARCHAR(100)
+        COMMENT '课程名称' NULL,
+    sort_num INTEGER
+        COMMENT '排序值' NULL,
+    create_id BIGINT
+        COMMENT '创建人ID' NULL,
+    create_time BIGINT
+        COMMENT '创建时间' NULL,
+    update_id BIGINT
+        COMMENT '更新人ID' NULL,
+    update_time BIGINT
+        COMMENT '更新时间' NULL
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='培养方案课程体系';
+
+/* Add Primary Key */
+ALTER TABLE obe_culture_program_course ADD CONSTRAINT pkobe_culture_program_course
+    PRIMARY KEY (id);
+
+/* Add Comments */
+ALTER TABLE obe_culture_program_course COMMENT = '培养方案课程体系';
+
+
+/******************** Add Table: obe_culture_program_requirement ************************/
+
+/* Build Table Structure */
+DROP TABLE IF EXISTS `obe_culture_program_requirement`;
+CREATE TABLE obe_culture_program_requirement
+(
+    id BIGINT NOT NULL,
+    culture_program_id BIGINT
+        COMMENT '培养方案ID' NOT NULL,
+    code VARCHAR(50)
+        COMMENT '毕业要求code' NULL,
+    name VARCHAR(50)
+        COMMENT '毕业要求' NOT NULL,
+    content MEDIUMTEXT
+        COMMENT '内容' NULL,
+    parent_id BIGINT
+        COMMENT '上级毕业要求' NULL,
+    sort_num INTEGER
+        COMMENT '排序值' NULL,
+    expect_value DOUBLE
+        COMMENT '预期值' NULL,
+    create_id BIGINT
+        COMMENT '创建人ID' NULL,
+    create_time BIGINT
+        COMMENT '创建时间' NULL,
+    update_id BIGINT
+        COMMENT '更新人ID' NULL,
+    update_time BIGINT
+        COMMENT '更新时间' NULL
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='培养方案毕业要求';
+
+/* Add Primary Key */
+ALTER TABLE obe_culture_program_requirement ADD CONSTRAINT pkobe_culture_program_requirement
+    PRIMARY KEY (id);
+
+/* Add Comments */
+ALTER TABLE obe_culture_program_requirement COMMENT = '培养方案毕业要求';
+
+/* Add Indexes */
+CREATE INDEX uq_professional_id ON obe_culture_program_requirement (culture_program_id) USING BTREE;
+
+/******************** Add Table: obe_culture_program_target ************************/
+
+/* Build Table Structure */
+DROP TABLE IF EXISTS `obe_culture_program_target`;
+CREATE TABLE obe_culture_program_target
+(
+    id BIGINT NOT NULL,
+    culture_program_id BIGINT
+        COMMENT '培养方案ID' NULL,
+    name VARCHAR(100)
+        COMMENT '培养目标名称' NULL,
+    detail VARCHAR(2000)
+        COMMENT '目标拆解详情' NULL,
+    create_id BIGINT NULL,
+    create_time BIGINT NULL,
+    update_id BIGINT NULL,
+    update_time BIGINT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='培养方案培养目标';
+
+/* Add Primary Key */
+ALTER TABLE obe_culture_program_target ADD CONSTRAINT pkobe_culture_program_target
+    PRIMARY KEY (id);
+
+/* Add Comments */
+ALTER TABLE obe_culture_program_target COMMENT = '培养方案培养目标';
+
+/* Add Indexes */
+CREATE INDEX idx_1 ON obe_culture_program_target (culture_program_id) USING BTREE;
+
+
+/******************** Add Table: obe_requirement_target_matrix ************************/
+
+/* Build Table Structure */
+DROP TABLE IF EXISTS `obe_requirement_target_matrix`;
+CREATE TABLE obe_requirement_target_matrix
+(
+    id BIGINT NOT NULL,
+    culture_program_id BIGINT
+        COMMENT '培养方案ID' NULL,
+    obe_requirement_id BIGINT
+        COMMENT '毕业要求ID' NULL,
+    obe_target_id BIGINT
+        COMMENT '培养目标ID' NULL,
+    enable TINYINT
+        COMMENT '是否包含' NULL,
+    create_id BIGINT NULL,
+    create_time BIGINT NULL,
+    update_id BIGINT NULL,
+    update_time BIGINT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='培养目标与毕业要求关系矩阵';
+
+/* Add Primary Key */
+ALTER TABLE obe_requirement_target_matrix ADD CONSTRAINT pkobe_requirement_target_matrix
+    PRIMARY KEY (id);
+
+/* Add Comments */
+ALTER TABLE obe_requirement_target_matrix COMMENT = '培养目标与毕业要求关系矩阵';
+
+
+/******************** Update Table: t_c_final_score ************************/
+
+/* Remove Indexes */
+DROP INDEX t_c_final_score_unique ON t_c_final_score;
+
+DROP INDEX t_c_score_end_exam_unique ON t_c_final_score;
+
+ALTER TABLE t_c_final_score CHANGE COLUMN exam_id exam_id BIGINT
+    COMMENT '考试id' NULL;
+
+ALTER TABLE t_c_final_score CHANGE COLUMN course_id course_id BIGINT
+    COMMENT '课程id' NOT NULL;
+
+ALTER TABLE t_c_final_score DROP COLUMN teach_course_id;
+
+ALTER TABLE t_c_final_score ADD culture_program_id BIGINT
+    COMMENT '培养方案id' NULL after id;
+
+/* Add Indexes */
+CREATE UNIQUE INDEX t_c_final_score_unique ON t_c_final_score (culture_program_id, course_id, name, student_code) USING BTREE;
+
+
+/******************** Remove Table: t_c_paper_positive ************************/
+DROP TABLE IF EXISTS t_c_paper_positive;
+
+/******************** Update Table: t_c_paper_struct ************************/
+
+/* Remove Indexes */
+DROP INDEX t_c_paper_struct_unique ON t_c_paper_struct;
+
+ALTER TABLE t_c_paper_struct CHANGE COLUMN exam_id exam_id BIGINT
+    COMMENT '考试id' NULL;
+
+ALTER TABLE t_c_paper_struct CHANGE COLUMN course_id course_id BIGINT
+    COMMENT '课程id' NOT NULL;
+
+ALTER TABLE t_c_paper_struct CHANGE COLUMN course_code course_code VARCHAR(100)
+    COMMENT '课程编码' NULL;
+
+ALTER TABLE t_c_paper_struct DROP COLUMN teach_course_id;
+
+ALTER TABLE t_c_paper_struct ADD culture_program_id BIGINT
+    COMMENT '培养方案id' NOT NULL after id;
+
+/* Add Indexes */
+CREATE UNIQUE INDEX t_c_paper_struct_unique ON t_c_paper_struct (culture_program_id, course_id) USING BTREE;
+
+/******************** Remove Table: t_c_score_end_exam ************************/
+DROP TABLE IF EXISTS t_c_score_end_exam;
+
+/******************** Remove Table: t_c_score_normal ************************/
+DROP TABLE IF EXISTS t_c_score_normal;
+
+/******************** Update Table: t_c_usual_score ************************/
+
+/* Remove Indexes */
+DROP INDEX t_c_usual_score_unique ON t_c_usual_score;
+
+ALTER TABLE t_c_usual_score CHANGE COLUMN exam_id exam_id BIGINT
+    COMMENT '考试id' NULL;
+
+ALTER TABLE t_c_usual_score CHANGE COLUMN course_id course_id BIGINT
+    COMMENT '课程id' NOT NULL;
+
+ALTER TABLE t_c_usual_score DROP COLUMN teach_course_id;
+
+ALTER TABLE t_c_usual_score ADD culture_program_id BIGINT
+    COMMENT '培养方案id' NOT NULL after id;
+
+/* Add Indexes */
+CREATE UNIQUE INDEX t_c_usual_score_unique ON t_c_usual_score (culture_program_id, course_id, name, student_code) USING BTREE;
+
+/******************** Update Table: t_p_course ************************/
+
+ALTER TABLE t_p_course DROP COLUMN course_id;
+
+/******************** Update Table: t_p_requirement ************************/
+
+/* Remove Indexes */
+DROP INDEX uq_professional_id ON t_p_requirement;
+
+ALTER TABLE t_p_requirement CHANGE COLUMN code code VARCHAR(45)
+    COMMENT '毕业要求code' NULL;
+
+
+/******************** Update Table: t_r_basic_info ************************/
+
+/* Remove Indexes */
+DROP INDEX t_r_basic_info_unique ON t_r_basic_info;
+
+ALTER TABLE t_r_basic_info CHANGE COLUMN exam_id exam_id BIGINT
+    COMMENT '考试id' NULL;
+
+ALTER TABLE t_r_basic_info CHANGE COLUMN course_id course_id BIGINT
+    COMMENT '课程id' NOT NULL;
+
+ALTER TABLE t_r_basic_info CHANGE COLUMN course_code course_code VARCHAR(100)
+    COMMENT '课程编码' NULL;
+
+ALTER TABLE t_r_basic_info DROP COLUMN teach_course_id;
+
+ALTER TABLE t_r_basic_info ADD culture_program_id BIGINT
+    COMMENT '培养方案id' NOT NULL after id;
+
+ALTER TABLE t_r_basic_info ADD course_en_name VARCHAR(100)
+    COMMENT '课程英文名称' NULL after course_name;
+
+ALTER TABLE t_r_basic_info ADD college VARCHAR(200)
+    COMMENT '开课学院' NULL after period;
+
+ALTER TABLE t_r_basic_info ADD profession VARCHAR(200)
+    COMMENT '开课专业' NULL after college;
+
+ALTER TABLE t_r_basic_info ADD finish_points MEDIUMTEXT
+    COMMENT '达成情况' NULL after participant;
+
+ALTER TABLE t_r_basic_info ADD requirement_points MEDIUMTEXT
+    COMMENT '课程支撑毕业要求达成情况评价' NULL after finish_points;
+
+ALTER TABLE t_r_basic_info ADD course_suggest MEDIUMTEXT
+    COMMENT '课程持续改进' NULL after requirement_points;
+
+/* Add Indexes */
+CREATE UNIQUE INDEX t_r_basic_info_unique ON t_r_basic_info (culture_program_id, course_id) USING BTREE;
+
+/******************** Update Table: teach_clazz ************************/
+
+/******************** Update Table: teach_course ************************/
+
+ALTER TABLE teach_course CHANGE COLUMN course_code course_code VARCHAR(20)
+    COMMENT '课程编号' NULL;
+
+ALTER TABLE teach_course DROP COLUMN course_id;
+
+/* Build Table Structure */
+DROP TABLE IF EXISTS `basic_professional`;
+CREATE TABLE basic_professional
+(
+    id BIGINT NOT NULL,
+    school_id BIGINT
+        COMMENT '学校ID' NULL,
+    name VARCHAR(80)
+        COMMENT '专业名称' NULL,
+    org_id BIGINT
+        COMMENT '所属学院ID' NULL,
+    create_id BIGINT
+        COMMENT '创建人ID' NULL,
+    create_time BIGINT
+        COMMENT '创建时间' NULL,
+    update_id BIGINT
+        COMMENT '更新人ID' NULL,
+    update_time BIGINT
+        COMMENT '更新时间' NULL
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='专业表';
+
+/* Add Primary Key */
+ALTER TABLE basic_professional ADD CONSTRAINT pkbasic_professional
+    PRIMARY KEY (id);
+
+/* Add Comments */
+ALTER TABLE basic_professional COMMENT = '专业表';
+
+DROP TABLE IF EXISTS t_p_course;
+
+DROP TABLE IF EXISTS t_p_matrix;
+
+DROP TABLE IF EXISTS t_p_professional;
+
+DROP TABLE IF EXISTS t_p_requirement;
+
+DROP TABLE IF EXISTS course_dimension;
+
+DROP TABLE IF EXISTS course_evaluation;
+
+DROP TABLE IF EXISTS course_target;
+
+DROP TABLE IF EXISTS course_weight;
+
+ALTER TABLE teach_course ADD course_id BIGINT NULL COMMENT '课程id';

distributed-print/src/main/java/com/qmth/distributed/print/DistributedPrintApplication.java

@@ -3,7 +3,6 @@ package com.qmth.distributed.print;
 import com.github.jeffreyning.mybatisplus.conf.EnableMPP;
 import com.qmth.boot.core.security.service.CustomizeAuthorizationService;
 import com.qmth.distributed.print.auth.DistributedPrintAuthenticationService;
-import com.qmth.teachcloud.common.base.CustomizedSqlInjector;
 import com.qmth.teachcloud.common.threadPool.MyThreadPool;
 import org.activiti.spring.boot.SecurityAutoConfiguration;
 import org.mybatis.spring.annotation.MapperScan;
@@ -21,9 +20,9 @@ import javax.annotation.Resource;
 
 @EnableMPP
 @SpringBootApplication(scanBasePackages = "com.qmth.*", exclude = {SecurityAutoConfiguration.class})
-@MapperScan({"com.qmth.distributed.print.business.mapper", "com.qmth.teachcloud.report.business.mapper", "com.qmth.teachcloud.common.mapper", "com.qmth.teachcloud.mark.mapper"})
+@MapperScan({"com.qmth.distributed.print.business.mapper", "com.qmth.teachcloud.report.business.mapper", "com.qmth.teachcloud.common.mapper", "com.qmth.teachcloud.mark.mapper", "com.qmth.teachcloud.obe.mapper"})
 //主要就是定义扫描的路径从中找出标识了需要装配的类自动装配到spring的bean容器中,做过web开发的同学一定都有用过@Controller，@Service，@Repository注解，查看其源码你会发现，他们中有一个共同的注解@Component，没错@ComponentScan注解默认就会装配标识了@Controller，@Service，@Repository，@Component注解的类到spring容器中
-@EntityScan(basePackages = {"com.qmth.distributed.print.business.entity", "com.qmth.teachcloud.report.business.entity", "com.qmth.teachcloud.common.entity", "com.qmth.teachcloud.mark.entity"})
+@EntityScan(basePackages = {"com.qmth.distributed.print.business.entity", "com.qmth.teachcloud.report.business.entity", "com.qmth.teachcloud.common.entity", "com.qmth.teachcloud.mark.entity", "com.qmth.teachcloud.obe.entity"})
 //用来扫描和发现指定包及其子包中的Entity定义
 @EnableTransactionManagement // spring开启事务支持
 @EnableAsync // 开启异步任务

distributed-print/src/main/java/com/qmth/distributed/print/api/BasicProfessionalController.java

@@ -1,14 +1,16 @@
 package com.qmth.distributed.print.api;
 
+
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.qmth.boot.api.constant.ApiConstant;
-import com.qmth.distributed.print.business.bean.dto.professional.ProfessionalDto;
 import com.qmth.teachcloud.common.contant.SystemConstant;
-import com.qmth.teachcloud.common.entity.BasicProfessional;
-import com.qmth.teachcloud.common.service.BasicProfessionalService;
 import com.qmth.teachcloud.common.util.Result;
 import com.qmth.teachcloud.common.util.ResultUtil;
+import com.qmth.teachcloud.obe.been.dto.professional.ProfessionalDto;
+import com.qmth.teachcloud.obe.entity.BasicProfessional;
+import com.qmth.teachcloud.obe.service.BasicProfessionalService;
 import io.swagger.annotations.*;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
@@ -29,34 +31,37 @@ import javax.validation.constraints.Min;
 public class BasicProfessionalController {
 
     @Resource
+    @Lazy
     private BasicProfessionalService basicProfessionalService;
 
     @ApiOperation(value = "查询（不分页）")
     @RequestMapping(value = "/list", method = RequestMethod.POST)
-    @ApiResponses({ @ApiResponse(code = 200, message = "分页查询", response = ProfessionalDto.class) })
-    public Result list(@ApiParam(value = "专业名称") @RequestParam(required = false) String name, @ApiParam(value = "所属学院") @RequestParam(required = false) Long orgId) {
+    @ApiResponses({@ApiResponse(code = 200, message = "分页查询", response = ProfessionalDto.class)})
+    public Result list(@ApiParam(value = "专业名称") @RequestParam(required = false) String name,
+                       @ApiParam(value = "所属学院") @RequestParam(required = false) Long orgId) {
         return ResultUtil.ok(basicProfessionalService.listData(name, orgId));
     }
 
     @ApiOperation(value = "查询")
     @RequestMapping(value = "/page", method = RequestMethod.POST)
-    @ApiResponses({ @ApiResponse(code = 200, message = "分页查询", response = ProfessionalDto.class) })
-    public Result page(@ApiParam(value = "专业名称") @RequestParam(required = false) String name, @ApiParam(value = "所属学院") @RequestParam(required = false) Long orgId,
-            @ApiParam(value = "分页页码", required = true) @RequestParam @Min(SystemConstant.PAGE_NUMBER_MIN) Integer pageNumber,
-            @ApiParam(value = "分页数", required = true) @RequestParam @Min(SystemConstant.PAGE_SIZE_MIN) @Max(SystemConstant.PAGE_SIZE_MAX) Integer pageSize) {
+    @ApiResponses({@ApiResponse(code = 200, message = "分页查询", response = ProfessionalDto.class)})
+    public Result page(@ApiParam(value = "专业名称") @RequestParam(required = false) String name,
+                       @ApiParam(value = "所属学院") @RequestParam(required = false) Long orgId,
+                       @ApiParam(value = "分页页码", required = true) @RequestParam @Min(SystemConstant.PAGE_NUMBER_MIN) Integer pageNumber,
+                       @ApiParam(value = "分页数", required = true) @RequestParam @Min(SystemConstant.PAGE_SIZE_MIN) @Max(SystemConstant.PAGE_SIZE_MAX) Integer pageSize) {
         return ResultUtil.ok(basicProfessionalService.pageData(new Page<>(pageNumber, pageSize), name, orgId));
     }
 
     @ApiOperation(value = "新增")
     @RequestMapping(value = "/save", method = RequestMethod.POST)
-    @ApiResponses({ @ApiResponse(code = 200, message = "新增", response = Boolean.class) })
+    @ApiResponses({@ApiResponse(code = 200, message = "新增", response = Boolean.class)})
     public Result save(@RequestBody BasicProfessional tpProfessional) {
         return ResultUtil.ok(basicProfessionalService.saveData(tpProfessional));
     }
 
     @ApiOperation(value = "删除")
     @RequestMapping(value = "/remove", method = RequestMethod.POST)
-    @ApiResponses({ @ApiResponse(code = 200, message = "新增", response = Boolean.class) })
+    @ApiResponses({@ApiResponse(code = 200, message = "新增", response = Boolean.class)})
     public Result remove(Long id) {
         return ResultUtil.ok(basicProfessionalService.remove(id));
     }

distributed-print/src/main/java/com/qmth/distributed/print/api/ObeCourseDimensionController.java

@@ -1,19 +0,0 @@
-package com.qmth.distributed.print.api;
-
-import com.qmth.boot.api.constant.ApiConstant;
-import com.qmth.teachcloud.common.contant.SystemConstant;
-import io.swagger.annotations.Api;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * @Description: 课程知识点管理
- * @Author: CaoZixuan
- * @Date: 2024-03-04
- */
-@Api(tags = "课程大纲知识点管理controller")
-@RestController
-@RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + SystemConstant.PREFIX_URL_OBE + "/course_dimension")
-public class ObeCourseDimensionController {
-
-}

distributed-print/src/main/java/com/qmth/distributed/print/api/ObeCourseRequirementDimensionController.java

@@ -1,22 +0,0 @@
-package com.qmth.distributed.print.api;
-
-import com.qmth.boot.api.constant.ApiConstant;
-import com.qmth.teachcloud.common.contant.SystemConstant;
-import io.swagger.annotations.Api;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * 课程大纲指标与知识点关联表 前端控制器
- * </p>
- *
- * @author CaoZixuan
- * @since 2024-06-07
- */
-@Api(tags = "课程大纲指标知识点关联关系管理controller")
-@RestController
-@RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + SystemConstant.PREFIX_URL_OBE + "/course_requirement_dimension")
-public class ObeCourseRequirementDimensionController {
-
-}

distributed-print/src/main/java/com/qmth/distributed/print/api/TPProfessionalController.java

@@ -1,155 +0,0 @@
-package com.qmth.distributed.print.api;
-
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.qmth.boot.api.constant.ApiConstant;
-import com.qmth.distributed.print.business.bean.dto.professional.MatrixDto;
-import com.qmth.distributed.print.business.bean.dto.professional.ProfessionalDto;
-import com.qmth.distributed.print.business.bean.params.professional.TPCourseParam;
-import com.qmth.distributed.print.business.bean.result.ScoreResult;
-import com.qmth.distributed.print.business.entity.TPCourse;
-import com.qmth.distributed.print.business.entity.TPMatrix;
-import com.qmth.distributed.print.business.entity.TPProfessional;
-import com.qmth.distributed.print.business.entity.TPRequirement;
-import com.qmth.distributed.print.business.service.TPCourseService;
-import com.qmth.distributed.print.business.service.TPMatrixService;
-import com.qmth.distributed.print.business.service.TPProfessionalService;
-import com.qmth.distributed.print.business.service.TPRequirementService;
-import com.qmth.teachcloud.common.contant.SystemConstant;
-import com.qmth.teachcloud.common.util.Result;
-import com.qmth.teachcloud.common.util.ResultUtil;
-import io.swagger.annotations.*;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletResponse;
-import javax.validation.constraints.Max;
-import javax.validation.constraints.Min;
-import java.util.List;
-
-/**
- * <p>
- * 专业认证专业表 前端控制器
- * </p>
- *
- * @author xf
- * @since 2024-04-22
- */
-@Api(tags = "专业认证Controller")
-@RestController
-@RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + SystemConstant.PREFIX_URL_PROFESSIONAL)
-public class TPProfessionalController {
-
-    @Resource
-    private TPProfessionalService tpProfessionalService;
-    @Resource
-    private TPCourseService tpCourseService;
-    @Resource
-    private TPRequirementService tpRequirementService;
-    @Resource
-    private TPMatrixService tpMatrixService;
-
-    @ApiOperation(value = "查询")
-    @RequestMapping(value = "/page", method = RequestMethod.POST)
-    @ApiResponses({@ApiResponse(code = 200, message = "分页查询", response = ProfessionalDto.class)})
-    public Result page(@ApiParam(value = "专业名称") @RequestParam(required = false) String name,
-                       @ApiParam(value = "课程编码") @RequestParam(required = false) Long orgId,
-                       @ApiParam(value = "分页页码", required = true) @RequestParam @Min(SystemConstant.PAGE_NUMBER_MIN) Integer pageNumber,
-                       @ApiParam(value = "分页数", required = true) @RequestParam @Min(SystemConstant.PAGE_SIZE_MIN) @Max(SystemConstant.PAGE_SIZE_MAX) Integer pageSize) {
-        return ResultUtil.ok(tpProfessionalService.pageData(new Page<>(pageNumber, pageSize), name, orgId));
-    }
-
-    @ApiOperation(value = "新增")
-    @RequestMapping(value = "/save", method = RequestMethod.POST)
-    @ApiResponses({@ApiResponse(code = 200, message = "新增", response = Boolean.class)})
-    public Result save(@RequestBody TPProfessional tpProfessional) {
-        return ResultUtil.ok(tpProfessionalService.saveData(tpProfessional));
-    }
-
-    @ApiOperation(value = "课程管理-选择课程")
-    @RequestMapping(value = "/course/query_list", method = RequestMethod.POST)
-    @ApiResponses({@ApiResponse(code = 200, message = "分页查询", response = TPCourse.class)})
-    public Result queryList(@ApiParam(value = "机构ID", required = true) @RequestParam Long orgId,
-                            @ApiParam(value = "机构ID", required = true) @RequestParam Long professionalId) {
-        return ResultUtil.ok(tpCourseService.queryList(orgId, professionalId));
-    }
-
-    @ApiOperation(value = "课程管理-查询")
-    @RequestMapping(value = "/course/list", method = RequestMethod.POST)
-    @ApiResponses({@ApiResponse(code = 200, message = "分页查询", response = TPCourse.class)})
-    public Result listCourse(@ApiParam(value = "专业ID", required = true) @RequestParam Long professionalId) {
-        return ResultUtil.ok(tpCourseService.listCourse(professionalId));
-    }
-
-    @ApiOperation(value = "课程管理-新增")
-    @RequestMapping(value = "/course/save", method = RequestMethod.POST)
-    @ApiResponses({@ApiResponse(code = 200, message = "新增", response = Boolean.class)})
-    public Result saveCourse(@RequestBody TPCourseParam tpCourseParam) {
-        return ResultUtil.ok(tpCourseService.saveCourse(tpCourseParam));
-    }
-
-    @ApiOperation(value = "课程管理-排序")
-    @RequestMapping(value = "/course/sort", method = RequestMethod.POST)
-    @ApiResponses({@ApiResponse(code = 200, message = "排序", response = Boolean.class)})
-    public Result saveSort(@RequestBody List<TPCourse> courseList) {
-        return ResultUtil.ok(tpCourseService.saveSort(courseList));
-    }
-
-    @ApiOperation(value = "课程管理-删除")
-    @RequestMapping(value = "/course/remove", method = RequestMethod.POST)
-    @ApiResponses({@ApiResponse(code = 200, message = "删除", response = Boolean.class)})
-    public Result removeCourse(@ApiParam(value = "专业课程ID", required = true) @RequestParam Long id) {
-        return ResultUtil.ok(tpCourseService.removeCourse(id));
-    }
-
-    @ApiOperation(value = "毕业要求-查询")
-    @RequestMapping(value = "/requirement/list", method = RequestMethod.POST)
-    @ApiResponses({@ApiResponse(code = 200, message = "分页查询", response = TPRequirement.class)})
-    public Result listRequirement(@ApiParam(value = "专业ID", required = true) @RequestParam Long professionalId) {
-        return ResultUtil.ok(tpRequirementService.listRequirement(professionalId));
-    }
-
-    @ApiOperation(value = "毕业要求-新增/编辑")
-    @RequestMapping(value = "/requirement/save", method = RequestMethod.POST)
-    @ApiResponses({@ApiResponse(code = 200, message = "分页查询", response = Boolean.class)})
-    public Result saveRequirement(@RequestBody TPRequirement tpRequirement) {
-        return ResultUtil.ok(tpRequirementService.saveRequirement(tpRequirement));
-    }
-
-    @ApiOperation(value = "毕业要求-排序")
-    @RequestMapping(value = "/requirement/sort", method = RequestMethod.POST)
-    @ApiResponses({@ApiResponse(code = 200, message = "排序", response = Boolean.class)})
-    public Result sortRequirement(@RequestBody List<TPRequirement> requirementList) {
-        return ResultUtil.ok(tpRequirementService.saveSort(requirementList));
-    }
-
-    @ApiOperation(value = "毕业要求-删除")
-    @RequestMapping(value = "/requirement/remove", method = RequestMethod.POST)
-    @ApiResponses({@ApiResponse(code = 200, message = "删除", response = Boolean.class)})
-    public Result removeRequirement(@ApiParam(value = "毕业要求ID", required = true) @RequestParam Long id) {
-        return ResultUtil.ok(tpRequirementService.removeRequirement(id));
-    }
-
-    @ApiOperation(value = "毕业矩阵支撑-查询")
-    @RequestMapping(value = "/matrix/get", method = RequestMethod.POST)
-    @ApiResponses({@ApiResponse(code = 200, message = "分页查询", response = MatrixDto.class)})
-    public Result listMatrix(@ApiParam(value = "专业ID", required = true) @RequestParam Long professionalId) {
-        return ResultUtil.ok(tpMatrixService.getMatrix(professionalId));
-    }
-
-    @ApiOperation(value = "毕业矩阵支撑-提交")
-    @RequestMapping(value = "/matrix/save", method = RequestMethod.POST)
-    @ApiResponses({@ApiResponse(code = 200, message = "分页查询", response = Boolean.class)})
-    public Result saveMatrix(@RequestBody List<TPMatrix> tpMatrixList) {
-        return ResultUtil.ok(tpMatrixService.saveMatrix(tpMatrixList));
-    }
-
-    @ApiOperation(value = "毕业矩阵支撑-下载")
-    @RequestMapping(value = "/matrix/download", method = RequestMethod.POST)
-    @ApiResponses({@ApiResponse(code = 200, message = "分页查询", response = Boolean.class)})
-    public void downloadMatrix(@ApiParam(value = "专业ID", required = true) @RequestParam Long professionalId,
-                               HttpServletResponse response) {
-        tpMatrixService.downloadMatrix(professionalId, response);
-    }
-
-}

distributed-print/src/test/java/com/qmth/distributed/print/ServiceTest.java

@@ -4,7 +4,6 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.qmth.distributed.print.business.bean.dto.examObject.ExamObjectDto;
-import com.qmth.distributed.print.business.bean.result.report.PaperStructDimensionResult;
 import com.qmth.distributed.print.business.entity.ExamPrintPlan;
 import com.qmth.distributed.print.business.entity.ExamStudent;
 import com.qmth.distributed.print.business.mapper.ExamStudentMapper;
@@ -62,9 +61,6 @@ public class ServiceTest {
     @Resource
     private ExamDetailCourseService examDetailCourseService;
 
-    @Resource
-    private CourseTargetService courseTargetService;
-
     @Test
     public void printPlanTemplateDatasource() {
         examPrintPlanService.printPlanTemplateDatasource(1L, 2L);

pom.xml

@@ -16,7 +16,6 @@
         <module>teachcloud-task</module>
         <module>teachcloud-report</module>
         <module>teachcloud-report-business</module>
-        <module>teachcloud-task</module>
         <module>teachcloud-obe</module>
     </modules>
 

teachcloud-common/src/main/java/com/qmth/teachcloud/common/contant/SystemConstant.java

@@ -173,7 +173,7 @@ public class SystemConstant {
     public static final String ATTACHMENT_TYPE = "attachment.type";
     public static final String ATTACHMENT_LENGTH = "attachment.length";
     public static final String ATTACHMENT_SIZE = "attachment.size";
-    public static final String AUTO_CREATE_PDF_RESET_MAX_COUNT = "auto.create.pdf.reset.max.count";
+//    public static final String AUTO_CREATE_PDF_RESET_MAX_COUNT = "auto.create.pdf.reset.max.count";
     public static final String THREAD_POOL_CORE_SIZE = "thread.pool.core.size";
     public static final String CUSTOM_THREAD_POOL_CORE_SIZE = "custom.thread.pool.core.size";
     public static final String SESSION_ACTIVE = "session.active";
@@ -278,6 +278,7 @@ public class SystemConstant {
     public static final String TXT_PREFIX = ".txt";
     public static final String WINDOWS = "Windows";
     public static final DecimalFormat df = new DecimalFormat("0.##");
+    public static final DecimalFormat dfS = new DecimalFormat("0");
 
     public static final String EXCEL_PREFIX = ".xlsx";
     public static final String WORD_PREFIX = ".docx";
@@ -295,7 +296,7 @@ public class SystemConstant {
     public static final int IN_SIZE_MAX = 1000;
     public static final int ALL_CARD = -1;
     public static final String MANUAL = "manual";
-    public static final String CREATE_PDF_TYPE = "createPdfType";
+//    public static final String CREATE_PDF_TYPE = "createPdfType";
     public static final String DELIMITER = ":";
     public static final String COMMA = ",";
     public static final int FINAL_SCALE = 1;
@@ -311,7 +312,7 @@ public class SystemConstant {
     //    public static final int MAX_RETRY_CREATE_PDF_COUNT = 5;
     //英文字母、数字、中文括号、英文括号、下划线(_)、减号(-)、中文横线(—)
     public static final String REGULAR_EXPRESSION_OF_CODE = "[a-zA-Z0-9](\\w+)?-?(\\w+)?—?(\\w+)?(\\((\\w+)?-?(\\w+)?—?(\\w+)?\\))?(\\（(\\w+)?-?(\\w+)?—?(\\w+)?\\）)?(\\w+)?";
-    public static final String REGULAR_EXPRESSION_OF_CODE1 = "^[a-zA-Z0-9]+$";
+//    public static final String REGULAR_EXPRESSION_OF_CODE1 = "^[a-zA-Z0-9]+$";
     public static final String REGULAR_EXPRESSION_OF_PHONE = "((\\d{3,4})|(\\(\\d{3,4}\\)-))?\\d{7,8}";
     public static final String REGULAR_EXPRESSION_OF_CODE_PRIMARY_DIMENSION = "[A-Z]";
     public static final String REGULAR_EXPRESSION_OF_CODE_SECOND_DIMENSION = "[A-Z][1-9][0-9]*";
@@ -331,7 +332,7 @@ public class SystemConstant {
     public static final String COMMA_OF_CHINESE = "，";
     public static final String PAUSE_SIGN = "、";
     public static final String ORG_SPLIT = "/";
-    public static final String ORG_POINT = "\\.";
+//    public static final String ORG_POINT = "\\.";
     public static final String PUSH_OPERATE_NOTICE = "操作成功，请去基础配置 -> 系统设置 -> 同步管理中查看结果";
     public static final String EXCEL_PROTECT_KEY = "Qmth87863577";
     public static final String ZIP_ENCRYPT_PWD = "qmthzip";
@@ -345,7 +346,7 @@ public class SystemConstant {
     public static final String GET_EQUAL = "=";
     public static final String PATH_MATCH = "*";
     public static final String CATALOG_LINK = "->";
-    public static final String OPERATE_LINK = "--";
+//    public static final String OPERATE_LINK = "--";
     public static final String LIMIT1 = "limit 1";
 
     public static final Integer DEFAULT_BACKUP_COUNT = 1;
@@ -521,13 +522,13 @@ public class SystemConstant {
     public static final String OBJECT_DATA = "objectData";
     public static final String APPROVE_TF_FLOW_LOG = "TFFlowLog";//流程院长自动审批
     public static final String APPROVE_TF_FLOW_APPROVE = "TFFlowAppove";//流程流转记录
-    public static final String FLOW_WORK_MESSAGE = "workMsg";
-    public static final String FLOW_VIEW_MESSAGE = "viewMsg";
+//    public static final String FLOW_WORK_MESSAGE = "workMsg";
+//    public static final String FLOW_VIEW_MESSAGE = "viewMsg";
     public static final String PAPAER_ATTACHMENT_IDS = "paperAttachmentIds";//命题附件ids
     public static final String REDIS_LOCK_FLOW_TASK_PREFIX = "redis:lock:flow:task:";//流程节点锁
     public static final String REDIS_LOCK_EXAM_TASK_FLOW_PREFIX = "redis:lock:exam:task:flow:";//考试任务流程节点锁
     public static final String REDIS_LOCK_PAPER_NUMBER_PREFIX = "redis:lock:paper:number:";//试卷编号锁
-    public static final String REDIS_LOCK_COURSE_CODE_SEQUENCE_PREFIX = "redis:lock:courseCode:sequence:";//课程序号锁
+//    public static final String REDIS_LOCK_COURSE_CODE_SEQUENCE_PREFIX = "redis:lock:courseCode:sequence:";//课程序号锁
     public static final long REDIS_LOCK_FLOW_TASK_TIME_OUT = 60L * 2;
     public static final long REDIS_LOCK_EXAM_TASK_FLOW_TIME_OUT = 60L * 2;
     public static final String REDIS_LOCK_FLOW_PREFIX = "redis:lock:flow:";//流程锁
@@ -537,8 +538,8 @@ public class SystemConstant {
     public static final String REDIS_LOCK_CALCULATE_PREFIX = "redis:lock:calculate:";//计算锁
     public static final long REDIS_LOCK_CALCULATE_TIME_OUT = 60L * 60;
     public static final long REDIS_LOCK_PAPER_NUMBER_TIME_OUT = 60L * 2;
-    public static final String REDIS_FINAL_SCORE_DATA_FLOW_PREFIX = "redis:lock:final:score:data";//期末考试数据锁
-    public static final String REDIS_PAPER_STRUCT_FLOW_PREFIX = "redis:lock:final:score:paper:struct";//期末考试试卷结构锁
+    public static final String REDIS_FINAL_SCORE_DATA_PREFIX = "redis:lock:final:score:data";//期末考试数据锁
+    public static final String REDIS_PAPER_STRUCT_PREFIX = "redis:lock:final:score:paper:struct";//期末考试试卷结构锁
     public static final String REDIS_OBE_RADAR_DATA_PREFIX = "redis:lock:obe:radar:data";//obe雷达报表锁
     public static final String REDIS_OBE_RADAR_DETAIL_DATA_PREFIX = "redis:lock:obe:radar:detail:data";//obe雷达详情报表锁
     public static final String REDIS_OBE_RADAR_AGAIN_DATA_PREFIX = "redis:lock:obe:radar:again:data";//obe雷达报表重新算锁