1.文档浏览增加文件路径，过滤空目录以及展示所有子集文件

src/main/java/com/baosight/hggp/hg/wd/service/ServiceHGWD001D.java

@@ -35,7 +35,6 @@ import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
-import java.util.Optional;
 import java.util.stream.Collectors;
 
 /**
@@ -226,7 +225,7 @@ public class ServiceHGWD001D extends TreeService {
 			if (CommonConstant.Field.ROOT.equals(node) || CommonConstant.Field.ROOT2.equals(node)) {
 				inInfo.addBlock(node).setRows(queryTopNode(node));
 			} else if (ProjectSourceEnum.contains(node)) {
-				inInfo.addBlock(node).setRows(queryFirstNode(node, ename));
+				inInfo.addBlock(node).setRows(queryFirstNode(node, ename, pageCode));
 			} else {
 				inInfo.addBlock(node).setRows(queryChildNode(projCode, node, ename, pageCode));
 			}
@@ -287,9 +286,10 @@ public class ServiceHGWD001D extends TreeService {
 	 *
 	 * @param parentId
 	 * @param ename
+	 * @param pageCode 页码
 	 * @return
 	 */
-	public List queryFirstNode(String parentId, String ename) {
+	public List queryFirstNode(String parentId, String ename, String pageCode) {
 		// SPARE：备件制造图不限制;非管理员仅查询自己有权限的项目
 		String userId = UserSessionUtils.getLoginName();
 		boolean isManager = HgWdUtils.HgWd009.isManager(userId);
@@ -307,9 +307,12 @@ public class ServiceHGWD001D extends TreeService {
 			return results;
 		}
 		for (HGSC001 dbSc001 : dbSc001s) {
+			int count = getChildCount(dbSc001.getProjCode(), isManager, isSpare, pageCode);
+			if ("HGWD002".equals(pageCode) && count == 0) {
+				continue;
+			}
 			String text = dbSc001.getProjName() + "（" + dbSc001.getProjCode() + "）";
 			Map leafMap = buildLeaf(parentId, dbSc001.getProjCode(), text, HgWdConstant.LeafType.P);
-			int count = getChildCount(dbSc001.getProjCode(), isManager, isSpare, null);
 			leafMap.put("projCode", dbSc001.getProjCode());
 			leafMap.put("projName", dbSc001.getProjName());
 			leafMap.put("ename", dbSc001.getProjCode());
@@ -355,8 +358,11 @@ public class ServiceHGWD001D extends TreeService {
 		// 查询目录授权人数
 		List<HGWD003> dbWd003s = HGWDTools.HgWd003.list(fileIds);
 		for (HGWD001 dbWd001 : dbWd001s) {
-			Map leafMap = buildLeaf(parentId, dbWd001.getFileId(), dbWd001.getFileName(), HgWdConstant.LeafType.C);
 			int count = getChildCount(dbWd001.getFileId(), isManager, isSpare, pageCode);
+			if ("HGWD002".equals(pageCode) && count == 0) {
+				continue;
+			}
+			Map leafMap = buildLeaf(parentId, dbWd001.getFileId(), dbWd001.getFileName(), HgWdConstant.LeafType.C);
 			leafMap.put("projCode", dbWd001.getProjCode());
 			leafMap.put("projName", dbWd001.getProjName());
 			leafMap.put("ename", dbWd001.getProjCode());
@@ -364,9 +370,6 @@ public class ServiceHGWD001D extends TreeService {
 			leafMap.put("leafLevel", dbWd001.getLeafLevel());
 			leafMap.put("count", count);
 			leafMap.put("filePath", dbWd001.getFilePath());
-			if ("HGWD002".equals(pageCode) && count == 0) {
-				continue;
-			}
 			if (!isManager && !isSpare) {
 				leafMap.put("isAuth", "1");
 				// 从已授权的信息中查找出自己
@@ -430,9 +433,7 @@ public class ServiceHGWD001D extends TreeService {
 	 * @return 节点数量
 	 */
 	public int getChildCount(String fileId, boolean isManager, boolean isSpare, String pageCode) {
-		List<HGWD001> hgwd001List = HgWdUtils.HgWd001.queryChildren(fileId, isManager, isSpare); //查询子级目录
-		List<String> childIds = Optional.ofNullable(hgwd001List).orElse(new ArrayList<>()).stream()
-				.map(HGWD001::getFileId).collect(Collectors.toList());
+		List<String> childIds = HgWdUtils.HgWd001.queryChildrenId(fileId, isManager, isSpare); //查询子级目录
 		// 已授权人员信息
 		List<HGWD003> dbWd003List = HGWDTools.HgWd003.list(childIds);
 		List<HGWD099> fWd099s = HGWDTools.HgWd099.queryByBiz("WD", childIds, pageCode);

src/main/java/com/baosight/hggp/hg/wd/service/ServiceHGWD002.java

@@ -16,8 +16,10 @@ import com.baosight.hggp.util.StringUtils;
 import com.baosight.iplat4j.core.ei.EiConstant;
 import com.baosight.iplat4j.core.ei.EiInfo;
 import com.baosight.iplat4j.core.service.impl.ServiceBase;
+import org.apache.commons.collections.CollectionUtils;
 
 import java.util.Arrays;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -60,17 +62,22 @@ public class ServiceHGWD002 extends ServiceBase {
 			if (StringUtils.isBlank(fileId)) {
 				return inInfo;
 			}
-			String parentId = MapUtils.getString(queryRow, HGWD001.FIELD_PARENT_ID);
 			String projCode = MapUtils.getString(queryRow, HGWD001.FIELD_PROJ_CODE);
 			// 判断是否备件制造图
-			boolean isSpare = HgWdUtils.HgWd001.isSpare(parentId, projCode);
+			boolean isSpare = HgWdUtils.HgWd001.isSpare(fileId, projCode);
+			boolean isManager = HgWdUtils.HgWd009.isManager();
 			// 仅查询已发布的文件
 			queryRow.put(HGWD001.FIELD_STATUS, HgWdConstant.FileStatus.S_1);
 			// 管理员、无权限的目录不做权限验证
-			if (!(isSpare || HgWdUtils.HgWd009.isManager())) {
+			if (!isSpare && !isManager) {
 				queryRow.put(User.FIELD_USER_ID, UserSessionUtils.getUserId());
 			}
-			builder(inInfo);
+			// 查询有权限的子集目录
+			List<String> childrenIds = HgWdUtils.HgWd001.queryChildrenId(fileId, isManager, isSpare);
+			if (CollectionUtils.isEmpty(childrenIds)) {
+				return inInfo;
+			}
+			queryRow.put("fileIds", childrenIds);
 			inInfo = super.query(inInfo, HGWD002.QUERY, new HGWD002());
 		} catch (Exception e) {
 			LogUtils.setDetailMsg(inInfo, e, "查询失败");
@@ -78,79 +85,4 @@ public class ServiceHGWD002 extends ServiceBase {
 		return inInfo;
 	}
 	
-	public void builder(EiInfo eiInfo) {
-		String[] orderBy = eiInfo.getBlock(EiConstant.resultBlock).getString("orderBy").split(",");
-		if (orderBy.length > 0) {
-			StringBuilder orderByStr = new StringBuilder();
-			for (int i = 0; i < orderBy.length; i++) {
-				if (i != 0 && i != orderByStr.length() - 1) {
-					orderByStr.append(",");
-				}
-				switch (orderBy[i]) {
-					case "fileType asc":
-						orderByStr.append(orderBy[i].replace("fileType asc", "a.fileType asc"));
-						break;
-					case "docId asc":
-						orderByStr.append(orderBy[i].replace("docId asc", "b.docId asc"));
-						break;
-					case "docName asc":
-						orderByStr.append(orderBy[i].replace("docName asc", "b.docName asc"));
-						break;
-					case "docVersion asc":
-						orderByStr.append(orderBy[i].replace("docVersion asc", "b.docVersion asc"));
-						break;
-					case "createdTime asc":
-						orderByStr.append(orderBy[i].replace("createdTime asc", "b.createdTime asc"));
-						break;
-					case "updatedTime asc":
-						orderByStr.append(orderBy[i].replace("updatedTime asc", "b.updatedTime asc"));
-						break;
-					case "previewNum asc":
-						orderByStr.append(orderBy[i].replace("previewNum asc", "b.previewNum asc"));
-						break;
-					case "downloadNum asc":
-						orderByStr.append(orderBy[i].replace("downloadNum asc", "b.downloadNum asc"));
-						break;
-					case "fileType desc":
-						orderByStr.append(orderBy[i].replace("fileType desc", "a.fileType desc"));
-						break;
-					case "docId desc":
-						orderByStr.append(orderBy[i].replace("docId desc", "b.docId desc"));
-						break;
-					case "docName desc":
-						orderByStr.append(orderBy[i].replace("docName desc", "b.docName desc"));
-						break;
-					case "docVersion desc":
-						orderByStr.append(orderBy[i].replace("docVersion desc", "b.docVersion desc"));
-						break;
-					case "createdTime desc":
-						orderByStr.append(orderBy[i].replace("createdTime desc", "b.createdTime desc"));
-						break;
-					case "previewNum desc":
-						orderByStr.append(orderBy[i].replace("previewNum desc", "b.previewNum desc"));
-						break;
-					case "downloadNum desc":
-						orderByStr.append(orderBy[i].replace("downloadNum desc", "b.downloadNum desc"));
-						break;
-					case "updatedTime desc":
-						orderByStr.append(orderBy[i].replace("updatedTime desc", "b.updatedTime desc"));
-						break;
-					case "changeContent asc":
-						orderByStr.append(orderBy[i].replace("downloadNum desc", "b.changeContent asc"));
-						break;
-					case "changeContent desc":
-						orderByStr.append(orderBy[i].replace("updatedTime desc", "b.changeContent desc"));
-						break;
-					default:
-						if (!orderBy[i].isEmpty()) {
-							orderByStr.append(orderBy[i]);
-						} else {
-							orderByStr.append(orderBy[i]);
-						}
-						break;
-				}
-			}
-			eiInfo.getBlock(EiConstant.resultBlock).set("orderBy", orderByStr);
-		}
-	}
 }

src/main/java/com/baosight/hggp/hg/wd/sql/HGWD002.xml

@@ -26,7 +26,8 @@
         B.CREATED_TIME as "createdTime",  <!-- 创建时间 -->
         B.UPDATED_BY as "updatedBy",  <!-- 记录修改者 -->
         B.UPDATED_NAME as "updatedName",  <!-- 记录修改名称 -->
-        B.UPDATED_TIME as "updatedTime"  <!-- 记录修改时间 -->
+        B.UPDATED_TIME as "updatedTime",  <!-- 记录修改时间 -->
+        B.FILE_PATH as "filePath"   <!-- 文件路径 -->
     </sql>
 
     <sql id="condition">
@@ -37,21 +38,15 @@
 		<isNotEmpty prepend=" AND " property="id">
 			A.ID = #id#
 		</isNotEmpty>
-		<isNotEmpty prepend=" AND " property="companyName">
-            A.COMPANY_NAME LIKE CONCAT('%', #companyName#, '%')
-		</isNotEmpty>
 		<isNotEmpty prepend=" AND " property="projName">
             A.PROJ_NAME LIKE CONCAT('%', #projName#, '%')
 		</isNotEmpty>
-        <isNotEmpty prepend=" AND " property="fileId">
-            A.FILE_ID = #fileId#
+        <isNotEmpty prepend=" AND " property="fileIds">
+            A.FILE_ID IN <iterate open="(" conjunction="," close=")" property="fileIds">#fileIds[]#</iterate>
         </isNotEmpty>
 		<isNotEmpty prepend=" AND " property="fileType">
             A.FILE_TYPE = #fileType#
 		</isNotEmpty>
-		<isNotEmpty prepend=" AND " property="fileName">
-            A.FILE_NAME LIKE CONCAT('%', #fileName#, '%')
-		</isNotEmpty>
 		<isNotEmpty prepend=" AND " property="status">
             B.STATUS = #status#
 		</isNotEmpty>
@@ -73,6 +68,9 @@
         <isNotEmpty prepend=" AND " property="docType">
             B.DOC_TYPE = #docType#
         </isNotEmpty>
+        <isNotEmpty prepend=" AND " property="filePath">
+            B.FILE_PATH LIKE CONCAT('%', #filePath#, '%')
+        </isNotEmpty>
 	</sql>
 
     <sql id="orderBy">

src/main/java/com/baosight/hggp/hg/wd/utils/HgWdUtils.java

@@ -9,7 +9,10 @@ import com.baosight.hggp.hg.wd.domain.HGWD003;
 import com.baosight.hggp.hg.wd.tools.HGWDTools;
 import com.baosight.hggp.util.StringUtils;
 
+import org.apache.commons.collections.CollectionUtils;
+
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * @author:songx
@@ -92,6 +95,23 @@ public class HgWdUtils {
 		/**
 		 * 查询子节点
 		 *
+		 * @param parentId 父级节点
+		 * @param isManager true：管理员
+		 * @param isSpare true：备件制造图
+		 * @return
+		 */
+		public static List<String> queryChildrenId(String parentId, boolean isManager, boolean isSpare) {
+			// 管理员或者备件制造图查询所有子节点；其余查询当前节点有权限的子节点
+			List<HGWD001> dbWd001s = queryChildren(parentId, isManager, isSpare);
+			if (CollectionUtils.isEmpty(dbWd001s)) {
+				return null;
+			}
+			return dbWd001s.stream().map(HGWD001::getFileId).collect(Collectors.toList());
+		}
+		
+		/**
+		 * 查询子节点
+		 *
 		 * @param parentId
 		 * @param isManager true：管理员
 		 * @param isSpare true：备件制造图

src/main/webapp/HG/PZ/HGPZ021.jsp

@@ -27,7 +27,7 @@
 			<EF:EFColumn ename="fieldCode" cname="字段英文名" enable="false" width="180" align="left"/>
 			<EF:EFColumn ename="fieldName" cname="字段中文名" enable="false" width="180" align="left" sort="false"/>
 			<EF:EFColumn ename="aliasName" cname="字段别名" enable="false" width="160" align="left" sort="false"/>
-			<EF:EFColumn ename="sortNum" cname="排序" width="80" align="center" required="true"/>
+			<EF:EFColumn ename="sortNum" cname="排序" width="100" align="center" required="true"/>
 			<EF:EFComboColumn ename="isDefault" cname="是否默认" width="100" align="center" copy="true" required="true"
 			                  sort="false">
 				<EF:EFCodeOption codeName="hggp.common.yesNo"/>

src/main/webapp/HG/WD/HGWD002.js

@@ -98,7 +98,7 @@ $(function () {
 				// 设置选中节点
 				treeSelectClick(model);
 				inInfo.set("inqu_status-0-projCode", $("#inqu_status-0-projCode").val());
-				inInfo.set("inqu_status-0-pageCode","HGWD002");
+				inInfo.set("inqu_status-0-pageCode", "HGWD002");
 				return inInfo;
 			},
 			select: function (e) {
@@ -128,11 +128,8 @@ $(function () {
 			},
 			selectTreeNode: {
 				fileId: '',
-				parentId: '',
 				projCode: '',
-				companyCode: '',
-				leafLevel: '',
-				type: '',
+				leafType: '',
 				downloadFlag: '0'
 			},
 			// expandLevel:1,
@@ -296,21 +293,14 @@ let treeSelectClick = function (nodeData) {
  * @param nodeData
  */
 let setTreeNodeValue = function (nodeData) {
-	let leafLevel = nodeData.leafLevel == null ? 0 : nodeData.leafLevel;
-	IPLATUI.EFTree.docTree.selectTreeNode.fileId = nodeData.label;
-	IPLATUI.EFTree.docTree.selectTreeNode.parentId = nodeData.parentId;
-	IPLATUI.EFTree.docTree.selectTreeNode.fileName = nodeData.text;
-	IPLATUI.EFTree.docTree.selectTreeNode.companyCode = nodeData.companyCode;
+	IPLATUI.EFTree.docTree.selectTreeNode.fileId = nodeData.id;
 	IPLATUI.EFTree.docTree.selectTreeNode.projCode = nodeData.projCode;
-	IPLATUI.EFTree.docTree.selectTreeNode.leafLevel = leafLevel;
+	IPLATUI.EFTree.docTree.selectTreeNode.leafType = nodeData.leafType;
 	IPLATUI.EFTree.docTree.selectTreeNode.downloadFlag = nodeData.downloadFlag == null ? 0
 		: nodeData.downloadFlag;
-	$("[name = 'inqu_status-0-parentId']").val(nodeData.label);
+	$("[name = 'inqu_status-0-parentId']").val(nodeData.id);
 	$("[name = 'inqu_status-0-fileId']").val(nodeData.id);
 	$("[name = 'inqu_status-0-projCode']").val(nodeData.projCode);
-	$("[name = 'inqu_status-0-leafLevel']").val(leafLevel);
-	$("[name = 'inqu_status-0-type']").val(nodeData.type);
-	$("[name = 'inqu_status-0-fileName']").val(nodeData.text);
 }
 
 /**
@@ -318,8 +308,8 @@ let setTreeNodeValue = function (nodeData) {
  */
 let showAuthButton = function () {
 	// C:目录
-	let leafType = IPLATUI.EFTree.docTree.selectTreeNode.leafLevel;
-	if (leafType && leafType > 0) {
+	let leafType = IPLATUI.EFTree.docTree.selectTreeNode.leafType;
+	if (leafType === 'C') {
 		CommonUtils.showButton("PREVIEW");
 	} else {
 		CommonUtils.hideButton("PREVIEW");

src/main/webapp/HG/WD/HGWD002.jsp

@@ -19,14 +19,9 @@
 		</div>
 		<div id="right-pane" class="i-fit-height">
 			<EF:EFRegion id="inqu" title="查询条件">
+				<EF:EFInput cname="项目代码" ename="projCode" blockId="inqu_status" row="0" type="hidden"/>
+				<EF:EFInput cname="文档库id" ename="fileId" blockId="inqu_status" row="0" type="hidden"/>
 				<div class="row">
-					<EF:EFInput cname="项目代码" ename="projCode" blockId="inqu_status" row="0" type="hidden"/>
-					<EF:EFInput cname="文档库id" ename="parentId" blockId="inqu_status" row="0" type="hidden"/>
-					<EF:EFInput cname="文档库id" ename="fileId" blockId="inqu_status" row="0" type="hidden"/>
-					<EF:EFInput cname="类型" ename="type" blockId="inqu_status" row="0" type="hidden"/>
-					<EF:EFInput cname="层级" ename="leafLevel" blockId="inqu_status" row="0" type="hidden"/>
-					<EF:EFInput cname="文档库名称" ename="fileName" blockId="inqu_status" row="0" type="hidden"/>
-					<EF:EFInput cname="业务类型" ename="bizType" blockId="inqu_status" row="0" type="hidden" value="WD"/>
 					<EF:EFSelect blockId="inqu_status" row="0" ename="fileType" cname="附件分类" colWidth="3"
 					             filter="contains">
 						<EF:EFOption label="全部" value=""/>
@@ -38,28 +33,32 @@
 								   format="yyyy-MM-dd" ratio="3:3" satrtRatio="4:8" endRatio="4:8" readonly="false">
 					</EF:EFDateSpan>
 				</div>
+				<div class="row">
+					<EF:EFInput cname="文件路径" ename="filePath" blockId="inqu_status" row="0" colWidth="3"/>
+				</div>
 			</EF:EFRegion>
 
 			<EF:EFRegion id="result" title="明细信息" fitHeight="true">
-				<EF:EFGrid blockId="result" autoDraw="override" showCount="true" height="73vh" sort="setted"
+				<EF:EFGrid blockId="result" autoDraw="override" showCount="true" height="73vh" sort="single"
 				           checkMode="row">
 					<EF:EFColumn ename="id" cname="ID" hidden="true"/>
 					<EF:EFColumn ename="fileId" cname="ID" hidden="true"/>
-					<EF:EFColumn ename="docId" cname="附件ID" enable="false" width="120" align="center" sort="false"
-					             hidden="true"/>
+					<EF:EFColumn ename="docId" cname="附件ID" hidden="true"/>
 					<EF:EFColumn ename="operator" cname="操作" enable="false" width="80" align="center" sort="false"/>
-					<EF:EFComboColumn ename="fileType" cname="附件分类" enable="false" width="90" align="center">
+					<EF:EFColumn ename="docName" cname="附件名称" enable="false" width="220" alias="b.docName"/>
+					<EF:EFColumn ename="changeContent" cname="变更内容" enable="false" width="200" sort="false"/>
+					<EF:EFColumn ename="filePath" cname="文件路径" enable="false" width="200" alias="b.filePath"/>
+					<EF:EFComboColumn ename="fileType" cname="附件分类" enable="false" width="100" align="center"
+					                  alias="a.fileType">
 						<EF:EFCodeOption codeName="hggp.hgwd.fileType"/>
 					</EF:EFComboColumn>
-					<EF:EFColumn ename="docName" cname="附件名称" enable="false" width="220" sort="true"/>
-					<EF:EFColumn ename="docType" cname="附件后缀" enable="false" width="110" align="center" sort="true"/>
-					<EF:EFColumn ename="docVersion" cname="版本号" enable="false" width="90" align="center" sort="true"/>
-					<EF:EFColumn ename="changeContent" cname="变更内容" enable="false" width="200" align="center" sort="true"/>
-					<EF:EFColumn ename="updatedTime" cname="上传时间" parseFormats="['yyyyMMddHHmmss']" editType="datetime"
-					             dateFormat="yyyy-MM-dd HH:mm:ss" align="center" width="140" readonly="true"
-					             required="false" enable="false" sort="true"/>
-					<%--					<EF:EFColumn ename="previewNum" cname="预览次数" enable="false" width="100" align="right" sort="true"/>--%>
-					<%--					<EF:EFColumn ename="downloadNum" cname="下载次数" enable="false" width="100" align="right" sort="true"/>--%>
+					<EF:EFColumn ename="docType" cname="附件后缀" enable="false" width="110" align="center"
+					             alias="b.docType"/>
+					<EF:EFColumn ename="docVersion" cname="版本号" enable="false" width="100" align="center"
+					             alias="b.docVersion"/>
+					<EF:EFColumn ename="updatedTime" cname="上传时间" parseFormats="['yyyyMMddHHmmss']"
+					             editType="datetime" dateFormat="yyyy-MM-dd HH:mm:ss" align="center" width="140"
+					             enable="false" alias="b.updatedTime"/>
 				</EF:EFGrid>
 			</EF:EFRegion>
 		</div>