diff --git a/o2server/x_file_assemble_control/src/main/java/com/x/file/assemble/control/jaxrs/attachment2/ActionListWithFilter.java b/o2server/x_file_assemble_control/src/main/java/com/x/file/assemble/control/jaxrs/attachment2/ActionListWithFilter.java index a5c2f95329b58c5bf619c3311908647c78fe7f08..d634c3d79416157c0850a9014f8cbc14027da913 100644 --- a/o2server/x_file_assemble_control/src/main/java/com/x/file/assemble/control/jaxrs/attachment2/ActionListWithFilter.java +++ b/o2server/x_file_assemble_control/src/main/java/com/x/file/assemble/control/jaxrs/attachment2/ActionListWithFilter.java @@ -3,6 +3,7 @@ package com.x.file.assemble.control.jaxrs.attachment2; import com.x.base.core.container.EntityManagerContainer; import com.x.base.core.container.factory.EntityManagerContainerFactory; import com.x.base.core.entity.JpaObject; +import com.x.base.core.project.annotation.FieldDescribe; import com.x.base.core.project.bean.WrapCopier; import com.x.base.core.project.bean.WrapCopierFactory; import com.x.base.core.project.http.ActionResult; @@ -21,6 +22,12 @@ class ActionListWithFilter extends BaseAction { Business business = new Business(emc); List ids = business.attachment2().listWithName(effectivePerson.getDistinguishedName(),name); List wos = Wo.copier.copy(emc.list(Attachment2.class, ids)); + wos.stream().forEach(wo -> { + try { + wo.setPath(business.folder2().getSupPath(wo.getFolder())); + } catch (Exception e) { + } + }); SortTools.desc(wos, false, "createTime"); result.setData(wos); return result; @@ -34,5 +41,16 @@ class ActionListWithFilter extends BaseAction { static WrapCopier copier = WrapCopierFactory.wo(Attachment2.class, Wo.class, null, JpaObject.FieldsInvisible); + @FieldDescribe("文件路径") + private String path; + + public String getPath() { + return path; + } + + public void setPath(String path) { + this.path = path; + } + } }