소스 검색

加入试卷结构排序

wangliang 10 달 전
부모
커밋
9e06006daa

+ 4 - 0
distributed-print-business/pom.xml

@@ -209,6 +209,10 @@
             <groupId>org.activiti</groupId>
             <groupId>org.activiti</groupId>
             <artifactId>activiti-bpmn-layout</artifactId>
             <artifactId>activiti-bpmn-layout</artifactId>
         </dependency>
         </dependency>
+        <dependency>
+            <groupId>io.github.burukeyou</groupId>
+            <artifactId>jdframe</artifactId>
+        </dependency>
     </dependencies>
     </dependencies>
 
 
 </project>
 </project>

+ 6 - 0
pom.xml

@@ -58,6 +58,7 @@
 <!--        <jasypt.version>3.0.3</jasypt.version>-->
 <!--        <jasypt.version>3.0.3</jasypt.version>-->
         <poi-tl.version>1.12.1</poi-tl.version>
         <poi-tl.version>1.12.1</poi-tl.version>
         <poi-ooxml-schemas.version>4.1.2</poi-ooxml-schemas.version>
         <poi-ooxml-schemas.version>4.1.2</poi-ooxml-schemas.version>
+        <jdframe.version>0.0.5</jdframe.version>
     </properties>
     </properties>
 
 
     <dependencyManagement>
     <dependencyManagement>
@@ -401,6 +402,11 @@
                 <artifactId>tools-common</artifactId>
                 <artifactId>tools-common</artifactId>
                 <version>${qmth.boot.version}</version>
                 <version>${qmth.boot.version}</version>
             </dependency>
             </dependency>
+            <dependency>
+                <groupId>io.github.burukeyou</groupId>
+                <artifactId>jdframe</artifactId>
+                <version>${jdframe.version}</version>
+            </dependency>
         </dependencies>
         </dependencies>
     </dependencyManagement>
     </dependencyManagement>
 
 

+ 4 - 0
teachcloud-obe/src/main/java/com/qmth/teachcloud/obe/service/impl/TCFinalScoreServiceImpl.java

@@ -37,6 +37,8 @@ import com.qmth.teachcloud.obe.service.TCFinalScoreService;
 import com.qmth.teachcloud.obe.service.TCPaperStructService;
 import com.qmth.teachcloud.obe.service.TCPaperStructService;
 import com.qmth.teachcloud.obe.service.TCUsualScoreService;
 import com.qmth.teachcloud.obe.service.TCUsualScoreService;
 import com.qmth.teachcloud.obe.service.TRBasicInfoService;
 import com.qmth.teachcloud.obe.service.TRBasicInfoService;
+import io.github.burukeyou.dataframe.iframe.SDFrame;
+import io.github.burukeyou.dataframe.iframe.window.Sorter;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.collections4.CollectionUtils;
 import org.slf4j.Logger;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.slf4j.LoggerFactory;
@@ -373,6 +375,8 @@ public class TCFinalScoreServiceImpl extends ServiceImpl<TCFinalScoreMapper, TCF
                     }
                     }
                     BasicCourse basicCourse = basicCourseService.getById(courseId);
                     BasicCourse basicCourse = basicCourseService.getById(courseId);
                     Objects.requireNonNull(basicCourse, "未找到基础课程信息");
                     Objects.requireNonNull(basicCourse, "未找到基础课程信息");
+
+                    paperStructDimensionResultList = SDFrame.read(paperStructDimensionResultList).sortDesc(Sorter.sortDescBy(PaperStructDimensionResult::getMainNumber).sortDesc(PaperStructDimensionResult::getMainNumber)).toLists();
                     tcPaperStruct = new TCPaperStruct(cultureProgramId, courseId, basicCourse.getCode(), basicCourse.getName(), paperNumber, JacksonUtil.parseJson(paperStructDimensionResultList),
                     tcPaperStruct = new TCPaperStruct(cultureProgramId, courseId, basicCourse.getCode(), basicCourse.getName(), paperNumber, JacksonUtil.parseJson(paperStructDimensionResultList),
                             sysUser.getId());
                             sysUser.getId());
                     tcPaperStruct.setExamId(examId);
                     tcPaperStruct.setExamId(examId);

파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 9 - 1
teachcloud-obe/src/main/java/com/qmth/teachcloud/obe/service/impl/TCPaperStructServiceImpl.java


이 변경점에서 너무 많은 파일들이 변경되어 몇몇 파일들은 표시되지 않았습니다.