xiatian 6 ヶ月 前
コミット
afd77dab45

+ 9 - 3
src/main/java/cn/com/qmth/dp/examcloud/oe/modules/findreduplicatequestion/ExportQuesReduplicateConsumer.java

@@ -178,7 +178,7 @@ public class ExportQuesReduplicateConsumer extends Consumer<Course> {
     // }
 
     private void checkQuestion(List<QuestionDto> dtos, String cname, String ccode) {
-        List<RetDto> ret = new ArrayList<>();
+        List<RetDto> temret = new ArrayList<>();
         Set<String> checkIds = new HashSet<>();
         for (QuestionDto dto : dtos) {
             dto.setExtractText(PaperUtil.getExtractText(dto));
@@ -215,17 +215,23 @@ public class ExportQuesReduplicateConsumer extends Consumer<Course> {
                         rd.setCreationDate(dto.getCreationDate());
                         // rd.setValid("是");
                         fillInfo(rd);
-                        ret.add(rd);
+                        temret.add(rd);
                     }
                     RetDto rd = new RetDto(group, ccode, cname, subdto.getQuestionType().getName(), subdto.getId());
                     rd.setCreationDate(subdto.getCreationDate());
                     // rd.setValid("否");
                     fillInfo(rd);
                     // addRet(rd);
-                    ret.add(rd);
+                    temret.add(rd);
                 }
             }
         }
+        List<RetDto> ret = new ArrayList<>();
+        for (RetDto dto : temret) {
+            if (dto.getPaperName().indexOf("废") == -1) {
+                ret.add(dto);
+            }
+        }
         // 排序
         Collections.sort(ret, new Comparator<RetDto>() {
 

+ 4 - 4
src/main/java/cn/com/qmth/dp/examcloud/oe/modules/findreduplicatequestion/ExportReduplicateQuestionService.java

@@ -19,13 +19,13 @@ import cn.com.qmth.examcloud.web.support.SpringContextHolder;
 @Service
 public class ExportReduplicateQuestionService {
 
-    // private String rootOrgId = "17068";
-    private Long rootOrgId = 17351L;
+    private Long rootOrgId = 18735L;
+    // private Long rootOrgId = 17351L;
 
     private String mode = "file";
 
-    // private String dir = "e:/files/dianke/241205/";
-    private String dir = "e:/files/yunkai/241204/";
+    private String dir = "e:/files/dianke/241205/";
+    // private String dir = "e:/files/yunkai/241204/";
 
     // private String paperName = "230517";
     private int threadCount = 8;