禅道BUG修改。

byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/documenttool/entity/DocumentSplitInfo.java

@@ -99,4 +99,8 @@ public class DocumentSplitInfo extends BaseEntity {
     @TableField(exist = false)
     @Dict(dicCode = "split_standard_source")
     private String splitStandardSource;
+
+    // 文件状态展示字段
+    @TableField(exist = false)
+    private String fileTypeShow;
 }

byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/documenttool/service/impl/DocumentSplitServiceImpl.java

@@ -149,7 +149,24 @@ public class DocumentSplitServiceImpl implements IDocumentSplitService {
     public IPage<DocumentSplitInfo> queryByPage(DocumentSplitInfo documentSplitInfo, Integer pageNo, Integer pageSize) {
         // 构建查询条件
         QueryWrapper<SarFileSplitInfoEO> queryWrapper = getSarFileSplitInfoEOQueryWrapper(documentSplitInfo);
-        return documentSplitMapper.queryByPage(new Page<>(pageNo, pageSize), queryWrapper);
+        IPage<DocumentSplitInfo> documentSplitInfoIPage = documentSplitMapper.queryByPage(new Page<>(pageNo, pageSize), queryWrapper);
+        this.disposeData(documentSplitInfoIPage.getRecords());
+        return documentSplitInfoIPage;
+    }
+
+    private void disposeData(List<DocumentSplitInfo> datas) {
+        if (CollectionUtils.isNotEmpty(datas)) {
+            for (DocumentSplitInfo data : datas) {
+                if (StringUtils.isNotEmpty(data.getFileType())) {
+                    if (StringUtils.equals(data.getFileType(), "1")) {
+                        data.setFileTypeShow("发布稿");
+                    } else if (StringUtils.equals(data.getFileType(), "2")) {
+                        data.setFileTypeShow("正文");
+                    }
+                }
+            }
+        }
+
     }
 
     @Override
@@ -298,8 +315,8 @@ public class DocumentSplitServiceImpl implements IDocumentSplitService {
     public void add(SarFileSplitInfoEO sarFileSplitInfoEO) {
 //        // 企标权限校验
 //        enterpriseCheck(sarFileSplitInfoEO);
-//        // 唯一校验
-//        uniqueCheck(sarFileSplitInfoEO);
+        // 唯一校验
+        uniqueCheck(sarFileSplitInfoEO);
         // 保存文本拆分数据
         saveDocumentSplitInfo(sarFileSplitInfoEO);
         //拆分

byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/split/controller/SarFileSplitMenuEOController.java

@@ -36,7 +36,7 @@ public class SarFileSplitMenuEOController extends JeroController<SarFileSplitMen
     @GetMapping("/getSplitMenusByInfoId")
     public Result<List<SarFileSplitMenuEO>> list(SarFileSplitMenuEOPage page) throws Exception {
         page.setValidFlag("0");
-        page.setOrderBy("display_seq asc");
+        page.setOrderBy("display_seq,creation_time ASC");
         List<SarFileSplitMenuEO> getList = sarFileSplitMenuEOService.queryByList(page);
         return Result.OK(getList);
     }

byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/split/service/impl/SarFileSplitMenuEOServiceImpl.java

@@ -255,9 +255,25 @@ public class SarFileSplitMenuEOServiceImpl extends ServiceImpl<SarFileSplitMenuE
 
 
     private List<SarFileSplitMenuEO> createChildList(SarFileSplitMenuEO testTree, List<SarFileSplitMenuEO> treeList) {
-        return treeList.stream().filter(v -> testTree.getId().equals(v.getPId()))
+        List<SarFileSplitMenuEO> results = treeList.stream().filter(v -> testTree.getId().equals(v.getPId()))
                 .peek(v -> v.setChildren(createChildList(v, treeList)))
                 .collect(Collectors.toList());
+        if (CollectionUtils.isNotEmpty(results)) {
+            Collections.sort(results, new Comparator<SarFileSplitMenuEO>() {
+                @Override
+                public int compare(SarFileSplitMenuEO o1, SarFileSplitMenuEO o2) {
+                    if(o1.getDisplaySeq().compareTo(o2.getDisplaySeq())>0){
+                        return 1;
+                    }else if(o1.getDisplaySeq().compareTo(o2.getDisplaySeq())==0){
+                        if(o1.getCreationTime().compareTo(o2.getCreationTime())<0){
+                            return 1;
+                        }
+                    }
+                    return -1;
+                }
+            });
+        }
+        return results;
     }
 
         @Override