PDM前端改造

文件夹功能调试-未上传内网2023-05-05

src/com/yonde/basedata/search/SearchOperatorEnumUtil.java

@@ -46,6 +46,8 @@ public class SearchOperatorEnumUtil {
 
     public static final String DX_FOLDER_ID = "folderId";
 
+    public static final String DX_DOC_FOLDER_ID = "dxDocumentFolderId";
+
     public static final String DX_SUBTYPE_NAME = "subTypeName";
 
     public static final String DX_ID = "id";

src/com/yonde/basedata/service/BaseSearchService.java

@@ -363,7 +363,9 @@ public class BaseSearchService <V extends IdVO> implements RemoteAccess {
         if (CollectionUtils.isNotEmpty(subFolders)) {
             List<DXFolder> subList = new ArrayList<DXFolder>();
             for (SubFolder subFolder : subFolders) {
-                subList.add(new DXFolder(subFolder));
+                DXFolder dxFolderSub = new DXFolder(subFolder);
+                dxFolderSub.setParentId(dxFolder.getId());
+                subList.add(dxFolderSub);
             }
             dxFolder.setChildren(subList);
         } else {

src/com/yonde/common/DxSearchUtil.java

@@ -21,7 +21,6 @@ import wt.change2.WTChangeRequest2;
 import wt.doc.WTDocument;
 import wt.fc.*;
 import wt.folder.Folder;
-import wt.folder.Foldered;
 import wt.inf.container.WTContained;
 import wt.inf.container.WTContainer;
 import wt.log4j.LogR;
@@ -256,11 +255,12 @@ public class DxSearchUtil implements RemoteAccess, Serializable {
                 continue;
             }
             //TODO 文件夹
-            if (fieldName.equals(SearchOperatorEnumUtil.DX_FOLDER_ID)) {
+            if (fieldName.equals(SearchOperatorEnumUtil.DX_DOC_FOLDER_ID)) {
                 Folder folderByOid = (Folder) RfUtil.getWTObjectByOid("OR:wt.folder.SubFolder:" + item.value);
                 if (ObjectsUtil.nonNull(folderByOid)) {
-                    addQuerySpecOp(querySpec, operator);
-                    SearchCondition sc = new SearchCondition(clazz, Foldered.FOLDERING_INFO + "." + WTAttributeNameIfc.REF_OBJECT_ID,
+                    addQuerySpecOp(querySpec, operator);//Foldered.FOLDERING_INFO + "." + WTAttributeNameIfc.REF_OBJECT_ID
+
+                    SearchCondition sc = new SearchCondition(clazz, WTDocument.PARENT_FOLDER + "." + WTAttributeNameIfc.REF_OBJECT_ID,
                             SearchCondition.EQUAL, PersistenceHelper.getObjectIdentifier(folderByOid).getId());
                     querySpec.appendWhere(sc, new int[]{0});
                 }

src/com/yonde/common/entity/DXFolder.java

@@ -10,7 +10,7 @@ import java.util.List;
 
 
 public class DXFolder extends IdVO {
-
+	private Long parentId;
 	//文件夹名称
 	private String name          = "";
 	//文件夹全路径
@@ -24,6 +24,8 @@ public class DXFolder extends IdVO {
 	//容器oid
 	private String containerOid  = "";
 
+	private Long dxContextId;
+
 	private Boolean isLeaf = false;
 	//子文件夹
 	private List<DXFolder> children  = new ArrayList<DXFolder>();
@@ -33,10 +35,28 @@ public class DXFolder extends IdVO {
 
 	public DXFolder(Folder folder) {
 		this.id = PersistenceHelper.getObjectIdentifier(folder).getId();
+		this.dxContextId = PersistenceHelper.getObjectIdentifier(folder.getContainer()).getId();
 		this.name = folder.getName();
 		this.containerName = folder.getContainerName();
 		this.fullPath = folder.getFolderPath();
 	}
+
+	public Long getDxContextId() {
+		return dxContextId;
+	}
+
+	public void setDxContextId(Long dxContextId) {
+		this.dxContextId = dxContextId;
+	}
+
+	public Long getParentId() {
+		return parentId;
+	}
+
+	public void setParentId(Long parentId) {
+		this.parentId = parentId;
+	}
+
 	public String getName() {
 		return name;
 	}