3.3.2 update

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

@@ -1,5 +1,6 @@
 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;
@@ -36,6 +37,10 @@ public class TPMatrix extends BaseEntity implements Serializable {
     @ApiModelProperty(value = "指标值")
     private Double content;
 
+    @ApiModelProperty(value = "毕业要求排序值")
+    @TableField(exist = false)
+    private int requirementSortNum;
+
     public Long getProfessionalId() {
         return professionalId;
     }
@@ -76,6 +81,14 @@ public class TPMatrix extends BaseEntity implements Serializable {
         this.content = content;
     }
 
+    public int getRequirementSortNum() {
+        return requirementSortNum;
+    }
+
+    public void setRequirementSortNum(int requirementSortNum) {
+        this.requirementSortNum = requirementSortNum;
+    }
+
     @Override
     public String toString() {
         return "TPMatrix{" +

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

@@ -57,19 +57,19 @@ public class TPMatrixServiceImpl extends ServiceImpl<TPMatrixMapper, TPMatrix> i
         if (CollectionUtils.isNotEmpty(tpMatrixList)) {
             List<MatrixDto> matrixDtoList = new ArrayList<>();
             Map<Long, List<TPMatrix>> courseMap = tpMatrixList.stream().collect(Collectors.groupingBy(TPMatrix::getCourseId));
-            for (Map.Entry<Long, List<TPMatrix>> entry : courseMap.entrySet()) {
+            courseMap.entrySet().stream().sorted(Map.Entry.comparingByKey()).forEach(entry -> {
                 TPCourse tpCourse = tpCourseService.getById(entry.getKey());
                 MatrixDto matrixDto = new MatrixDto();
                 matrixDto.setCourseCode(tpCourse.getCourseCode());
                 matrixDto.setCourseName(tpCourse.getCourseName());
                 List<MatrixRequirementDto> matrixRequirementDtoList = new ArrayList<>();
                 Map<Long, List<TPMatrix>> requirementMap = entry.getValue().stream().collect(Collectors.groupingBy(TPMatrix::getRequirementId));
-                for (Map.Entry<Long, List<TPMatrix>> requirementEntry : requirementMap.entrySet()) {
+                requirementMap.entrySet().stream().sorted(Map.Entry.comparingByKey()).forEach(requirementEntry -> {
                     TPRequirement tpRequirement = tpRequirementService.getById(requirementEntry.getKey());
                     MatrixRequirementDto matrixRequirementDto = new MatrixRequirementDto();
                     matrixRequirementDto.setName(tpRequirement.getName());
                     // 排序
-                    List<MatrixSubRequirementDto> matrixSubRequirementDtoList = requirementEntry.getValue().stream().sorted(Comparator.comparing(TPMatrix::getSubName)).map(tpMatrix -> {
+                    List<MatrixSubRequirementDto> matrixSubRequirementDtoList = requirementEntry.getValue().stream().map(tpMatrix -> {
                         MatrixSubRequirementDto matrixSubRequirementDto = new MatrixSubRequirementDto();
                         matrixSubRequirementDto.setId(tpMatrix.getId());
                         matrixSubRequirementDto.setName(tpMatrix.getSubName());
@@ -78,10 +78,10 @@ public class TPMatrixServiceImpl extends ServiceImpl<TPMatrixMapper, TPMatrix> i
                     }).collect(Collectors.toList());
                     matrixRequirementDto.setSubRequirements(matrixSubRequirementDtoList);
                     matrixRequirementDtoList.add(matrixRequirementDto);
-                }
+                });
                 matrixDto.setRequirements(matrixRequirementDtoList);
                 matrixDtoList.add(matrixDto);
-            }
+            });
             return matrixDtoList;
         }
         return new ArrayList<>();
@@ -196,7 +196,7 @@ public class TPMatrixServiceImpl extends ServiceImpl<TPMatrixMapper, TPMatrix> i
                 tpMatrixAddList.add(tpMatrix);
             } else {
                 if (matrixList.size() == 1) {
-                    if(matrixList.get(0).getSubName() == null){
+                    if (matrixList.get(0).getSubName() == null) {
                         tpMatrixRemoveList.add(matrixList.get(0).getId());
 
                         for (int i = 1; i <= tpRequirement.getNodeCount(); i++) {

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

@@ -17,7 +17,8 @@
     </resultMap>
     <select id="listMatrix" resultType="com.qmth.distributed.print.business.entity.TPMatrix">
         SELECT
-            tpm.*
+            tpm.*,
+            tpr.sort_num requirementSortNum
         FROM
             t_p_matrix tpm
                 LEFT JOIN