Merge branch 'dev-sx' of http://129.211.46.84:8800/platform/hg-smart into master-dc

src/main/java/com/baosight/hggp/hg/wd/domain/HGWD002.java

@@ -19,9 +19,9 @@ import java.util.Map;
  * @history 2024-08-19 14:34:38 create
  */
 public class HGWD002 extends DaoEPBase {
-
+	
 	private static final long serialVersionUID = 1L;
-
+	
 	public static final String FIELD_ID = "id";
 	public static final String FIELD_ACCOUNT_CODE = "accountCode";    		/* 企业编码*/
 	public static final String FIELD_DEP_CODE = "depCode";    		/* 部门编码*/
@@ -49,7 +49,8 @@ public class HGWD002 extends DaoEPBase {
 	public static final String FIELD_DOWNLOAD_NUM = "downloadNum";    		/* 下载次数*/
 	public static final String FIELD_DOC_TYPE = "docType";   		/* 文件类型*/
 	public static final String FIELD_CHANGE_CONTENT = "changeContent";    		/* 变更内容*/
-
+	public static final String FIELD_FILE_PATH = "filePath";    		/* 文件路径*/
+	
 	public static final String COL_ID = "ID";
 	public static final String COL_ACCOUNT_CODE = "ACCOUNT_CODE";    		/* 企业编码*/
 	public static final String COL_DEP_CODE = "DEP_CODE";    		/* 部门编码*/
@@ -75,13 +76,14 @@ public class HGWD002 extends DaoEPBase {
 	public static final String COL_RELEASE_DATE = "RELEASE_DATE";    		/* 发布时间*/
 	public static final String COL_PREVIEW_NUM = "PREVIEW_NUM";    		/* 预览次数*/
 	public static final String COL_DOWNLOAD_NUM = "DOWNLOAD_NUM";    		/* 下载次数*/
-
+	public static final String COL_FILE_PATH = "FILE_PATH";    		/* 文件路径*/
+	
 	public static final String QUERY = "HGWD002.query";
 	public static final String COUNT = "HGWD002.count";
 	public static final String INSERT = "HGWD002.insert";
 	public static final String UPDATE = "HGWD002.update";
 	public static final String DELETE = "HGWD002.delete";
-
+	
 	private Long id = new Long(0);
 	private String accountCode = " ";		/* 企业编码*/
 	private String depCode = " ";		/* 部门编码*/
@@ -109,130 +111,135 @@ public class HGWD002 extends DaoEPBase {
 	private Integer downloadNum = new Integer(0);		/* 下载次数*/
 	private String docType = " ";		/* 文件类型*/
 	private String changeContent = " ";		/* 变更内容*/
-
+	private String filePath = " ";		/* 文件路径*/
+	
 	/**
 	 * initialize the metadata.
 	 */
 	public void initMetaData() {
 		EiColumn eiColumn;
-
+		
 		eiColumn = new EiColumn(FIELD_ID);
 		eiColumn.setPrimaryKey(true);
 		eiColumn.setDescName(" ");
 		eiMetadata.addMeta(eiColumn);
-
+		
 		eiColumn = new EiColumn(FIELD_ACCOUNT_CODE);
 		eiColumn.setDescName("企业编码");
 		eiMetadata.addMeta(eiColumn);
-
+		
 		eiColumn = new EiColumn(FIELD_DEP_CODE);
 		eiColumn.setDescName("部门编码");
 		eiMetadata.addMeta(eiColumn);
-
+		
 		eiColumn = new EiColumn(FIELD_CREATED_BY);
 		eiColumn.setDescName("记录创建者");
 		eiMetadata.addMeta(eiColumn);
-
+		
 		eiColumn = new EiColumn(FIELD_CREATED_NAME);
 		eiColumn.setDescName("记录创建名称");
 		eiMetadata.addMeta(eiColumn);
-
+		
 		eiColumn = new EiColumn(FIELD_CREATED_TIME);
 		eiColumn.setDescName("记录创建时间");
 		eiMetadata.addMeta(eiColumn);
-
+		
 		eiColumn = new EiColumn(FIELD_UPDATED_BY);
 		eiColumn.setDescName("记录修改者");
 		eiMetadata.addMeta(eiColumn);
-
+		
 		eiColumn = new EiColumn(FIELD_UPDATED_NAME);
 		eiColumn.setDescName("记录修改名称");
 		eiMetadata.addMeta(eiColumn);
-
+		
 		eiColumn = new EiColumn(FIELD_UPDATED_TIME);
 		eiColumn.setDescName("记录修改时间");
 		eiMetadata.addMeta(eiColumn);
-
+		
 		eiColumn = new EiColumn(FIELD_DELETE_FLAG);
 		eiColumn.setDescName("0-未删除，1-已删除");
 		eiMetadata.addMeta(eiColumn);
-
+		
 		eiColumn = new EiColumn(FIELD_COMPANY_CODE);
 		eiColumn.setDescName("公司编码");
 		eiMetadata.addMeta(eiColumn);
-
+		
 		eiColumn = new EiColumn(FIELD_COMPANY_NAME);
 		eiColumn.setDescName("公司名称");
 		eiMetadata.addMeta(eiColumn);
-
+		
 		eiColumn = new EiColumn(FIELD_PROJ_CODE);
 		eiColumn.setDescName("项目编码");
 		eiMetadata.addMeta(eiColumn);
-
+		
 		eiColumn = new EiColumn(FIELD_PROJ_NAME);
 		eiColumn.setDescName("项目名称");
 		eiMetadata.addMeta(eiColumn);
-
+		
 		eiColumn = new EiColumn(FIELD_FILE_ID);
 		eiColumn.setDescName("文件ID");
 		eiMetadata.addMeta(eiColumn);
-
+		
 		eiColumn = new EiColumn(FIELD_FILE_TYPE);
 		eiColumn.setDescName("文件类型");
 		eiMetadata.addMeta(eiColumn);
-
+		
 		eiColumn = new EiColumn(FIELD_FILE_NAME);
 		eiColumn.setDescName("文件名称");
 		eiMetadata.addMeta(eiColumn);
-
+		
 		eiColumn = new EiColumn(FIELD_DOC_ID);
 		eiColumn.setDescName("文件号");
 		eiMetadata.addMeta(eiColumn);
-
+		
 		eiColumn = new EiColumn(FIELD_DOC_NAME);
 		eiColumn.setDescName("文件附件名称");
 		eiMetadata.addMeta(eiColumn);
-
+		
 		eiColumn = new EiColumn(FIELD_DOC_VERSION);
 		eiColumn.setDescName("文件版本号");
 		eiMetadata.addMeta(eiColumn);
-
+		
 		eiColumn = new EiColumn(FIELD_STATUS);
 		eiColumn.setDescName("状态");
 		eiMetadata.addMeta(eiColumn);
-
+		
 		eiColumn = new EiColumn(FIELD_REMARK);
 		eiColumn.setDescName("备注");
 		eiMetadata.addMeta(eiColumn);
-
+		
 		eiColumn = new EiColumn(FIELD_RELEASE_DATE);
 		eiColumn.setDescName("发布时间");
 		eiMetadata.addMeta(eiColumn);
-
+		
 		eiColumn = new EiColumn(FIELD_PREVIEW_NUM);
 		eiColumn.setDescName("预览次数");
 		eiMetadata.addMeta(eiColumn);
-
+		
 		eiColumn = new EiColumn(FIELD_DOWNLOAD_NUM);
 		eiColumn.setDescName("下载次数");
 		eiMetadata.addMeta(eiColumn);
-
+		
 		eiColumn = new EiColumn(FIELD_DOC_TYPE);
 		eiColumn.setDescName("文件类型");
 		eiMetadata.addMeta(eiColumn);
-
+		
 		eiColumn = new EiColumn(FIELD_CHANGE_CONTENT);
 		eiColumn.setDescName("变更内容");
 		eiMetadata.addMeta(eiColumn);
+		
+		eiColumn = new EiColumn(FIELD_FILE_PATH);
+		eiColumn.setDescName("文件路径");
+		eiMetadata.addMeta(eiColumn);
 	}
-
+	
 	/**
 	 * the constructor.
 	 */
 	public HGWD002() {
 		initMetaData();
 	}
-
+	
 	/**
 	 * get the id .
 	 * @return the id
@@ -240,7 +247,7 @@ public class HGWD002 extends DaoEPBase {
 	public Long getId() {
 		return this.id;
 	}
-
+	
 	/**
 	 * set the id .
 	 *
@@ -256,7 +263,7 @@ public class HGWD002 extends DaoEPBase {
 	public String getAccountCode() {
 		return this.accountCode;
 	}
-
+	
 	/**
 	 * set the accountCode - 企业编码.
 	 *
@@ -272,7 +279,7 @@ public class HGWD002 extends DaoEPBase {
 	public String getDepCode() {
 		return this.depCode;
 	}
-
+	
 	/**
 	 * set the depCode - 部门编码.
 	 *
@@ -288,7 +295,7 @@ public class HGWD002 extends DaoEPBase {
 	public String getCreatedBy() {
 		return this.createdBy;
 	}
-
+	
 	/**
 	 * set the createdBy - 记录创建者.
 	 *
@@ -304,7 +311,7 @@ public class HGWD002 extends DaoEPBase {
 	public String getCreatedName() {
 		return this.createdName;
 	}
-
+	
 	/**
 	 * set the createdName - 记录创建名称.
 	 *
@@ -320,7 +327,7 @@ public class HGWD002 extends DaoEPBase {
 	public String getCreatedTime() {
 		return this.createdTime;
 	}
-
+	
 	/**
 	 * set the createdTime - 记录创建时间.
 	 *
@@ -336,7 +343,7 @@ public class HGWD002 extends DaoEPBase {
 	public String getUpdatedBy() {
 		return this.updatedBy;
 	}
-
+	
 	/**
 	 * set the updatedBy - 记录修改者.
 	 *
@@ -352,7 +359,7 @@ public class HGWD002 extends DaoEPBase {
 	public String getUpdatedName() {
 		return this.updatedName;
 	}
-
+	
 	/**
 	 * set the updatedName - 记录修改名称.
 	 *
@@ -368,7 +375,7 @@ public class HGWD002 extends DaoEPBase {
 	public String getUpdatedTime() {
 		return this.updatedTime;
 	}
-
+	
 	/**
 	 * set the updatedTime - 记录修改时间.
 	 *
@@ -384,7 +391,7 @@ public class HGWD002 extends DaoEPBase {
 	public Integer getDeleteFlag() {
 		return this.deleteFlag;
 	}
-
+	
 	/**
 	 * set the deleteFlag - 0-未删除，1-已删除.
 	 *
@@ -400,7 +407,7 @@ public class HGWD002 extends DaoEPBase {
 	public String getCompanyCode() {
 		return this.companyCode;
 	}
-
+	
 	/**
 	 * set the companyCode - 公司编码.
 	 *
@@ -416,7 +423,7 @@ public class HGWD002 extends DaoEPBase {
 	public String getCompanyName() {
 		return this.companyName;
 	}
-
+	
 	/**
 	 * set the companyName - 公司名称.
 	 *
@@ -432,7 +439,7 @@ public class HGWD002 extends DaoEPBase {
 	public String getProjCode() {
 		return this.projCode;
 	}
-
+	
 	/**
 	 * set the projCode - 项目编码.
 	 *
@@ -448,7 +455,7 @@ public class HGWD002 extends DaoEPBase {
 	public String getProjName() {
 		return this.projName;
 	}
-
+	
 	/**
 	 * set the projName - 项目名称.
 	 *
@@ -464,7 +471,7 @@ public class HGWD002 extends DaoEPBase {
 	public String getFileId() {
 		return this.fileId;
 	}
-
+	
 	/**
 	 * set the fileId - 文件ID.
 	 *
@@ -480,7 +487,7 @@ public class HGWD002 extends DaoEPBase {
 	public String getFileType() {
 		return this.fileType;
 	}
-
+	
 	/**
 	 * set the fileType - 文件类型.
 	 *
@@ -496,7 +503,7 @@ public class HGWD002 extends DaoEPBase {
 	public String getFileName() {
 		return this.fileName;
 	}
-
+	
 	/**
 	 * set the fileName - 文件名称.
 	 *
@@ -512,7 +519,7 @@ public class HGWD002 extends DaoEPBase {
 	public String getDocId() {
 		return this.docId;
 	}
-
+	
 	/**
 	 * set the docId - 文件号.
 	 *
@@ -528,7 +535,7 @@ public class HGWD002 extends DaoEPBase {
 	public String getDocName() {
 		return this.docName;
 	}
-
+	
 	/**
 	 * set the docName - 文件附件名称.
 	 *
@@ -544,7 +551,7 @@ public class HGWD002 extends DaoEPBase {
 	public Integer getDocVersion() {
 		return this.docVersion;
 	}
-
+	
 	/**
 	 * set the docVersion - 文件版本号.
 	 *
@@ -560,7 +567,7 @@ public class HGWD002 extends DaoEPBase {
 	public Integer getStatus() {
 		return this.status;
 	}
-
+	
 	/**
 	 * set the status - 状态.
 	 *
@@ -576,7 +583,7 @@ public class HGWD002 extends DaoEPBase {
 	public String getRemark() {
 		return this.remark;
 	}
-
+	
 	/**
 	 * set the remark - 备注.
 	 *
@@ -592,7 +599,7 @@ public class HGWD002 extends DaoEPBase {
 	public String getReleaseDate() {
 		return this.releaseDate;
 	}
-
+	
 	/**
 	 * set the releaseDate - 发布时间.
 	 *
@@ -608,7 +615,7 @@ public class HGWD002 extends DaoEPBase {
 	public Integer getPreviewNum() {
 		return this.previewNum;
 	}
-
+	
 	/**
 	 * set the previewNum - 预览次数.
 	 *
@@ -624,7 +631,7 @@ public class HGWD002 extends DaoEPBase {
 	public Integer getDownloadNum() {
 		return this.downloadNum;
 	}
-
+	
 	/**
 	 * set the downloadNum - 下载次数.
 	 *
@@ -633,15 +640,15 @@ public class HGWD002 extends DaoEPBase {
 	public void setDownloadNum(Integer downloadNum) {
 		this.downloadNum = downloadNum;
 	}
-
+	
 	public String getDocType() {
 		return docType;
 	}
-
+	
 	public void setDocType(String docType) {
 		this.docType = docType;
 	}
-
+	
 	/**
 	 * get the changeContent - 变更内容.
 	 * @return the changeContent
@@ -649,7 +656,7 @@ public class HGWD002 extends DaoEPBase {
 	public String getChangeContent() {
 		return this.changeContent;
 	}
-
+	
 	/**
 	 * set the changeContent - 变更内容.
 	 *
@@ -658,6 +665,15 @@ public class HGWD002 extends DaoEPBase {
 	public void setChangeContent(String changeContent) {
 		this.changeContent = changeContent;
 	}
+	
+	public String getFilePath() {
+		return filePath;
+	}
+	
+	public void setFilePath(String filePath) {
+		this.filePath = filePath;
+	}
+	
 	/**
 	 * get the value from Map.
 	 *
@@ -665,7 +681,7 @@ public class HGWD002 extends DaoEPBase {
 	 */
 	@Override
 	public void fromMap(Map map) {
-
+		
 		setId(NumberUtils.toLong(StringUtils.toString(map.get(FIELD_ID)), id));
 		setAccountCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_ACCOUNT_CODE)), accountCode));
 		setDepCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_DEP_CODE)), depCode));
@@ -693,14 +709,15 @@ public class HGWD002 extends DaoEPBase {
 		setDownloadNum(NumberUtils.toInteger(StringUtils.toString(map.get(FIELD_DOWNLOAD_NUM)), downloadNum));
 		setDocType(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_DOC_TYPE)), docType));
 		setChangeContent(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_CHANGE_CONTENT)), changeContent));
+		setFilePath(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_FILE_PATH)), filePath));
 	}
-
+	
 	/**
 	 * set the value to Map.
 	 */
 	@Override
 	public Map toMap() {
-
+		
 		Map map = new HashMap();
 		map.put(FIELD_ID, StringUtils.toString(id, eiMetadata.getMeta(FIELD_ID)));
 		map.put(FIELD_ACCOUNT_CODE, StringUtils.toString(accountCode, eiMetadata.getMeta(FIELD_ACCOUNT_CODE)));
@@ -729,7 +746,8 @@ public class HGWD002 extends DaoEPBase {
 		map.put(FIELD_DOWNLOAD_NUM, StringUtils.toString(downloadNum, eiMetadata.getMeta(FIELD_DOWNLOAD_NUM)));
 		map.put(FIELD_DOC_TYPE, StringUtils.toString(docType, eiMetadata.getMeta(FIELD_DOC_TYPE)));
 		map.put(FIELD_CHANGE_CONTENT, StringUtils.toString(changeContent, eiMetadata.getMeta(FIELD_CHANGE_CONTENT)));
-
+		map.put(FIELD_FILE_PATH, StringUtils.toString(filePath, eiMetadata.getMeta(FIELD_FILE_PATH)));
+		
 		return map;
 	}
 }

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

@@ -7,7 +7,6 @@ import com.baosight.hggp.core.tools.CodeValueTools;
 import com.baosight.hggp.hg.constant.HGConstant;
 import com.baosight.hggp.hg.sc.domain.HGSC001;
 import com.baosight.hggp.hg.sc.enums.ProjectSourceEnum;
-import com.baosight.hggp.hg.sc.tools.HGSCTools;
 import com.baosight.hggp.hg.wd.constant.HgWdConstant;
 import com.baosight.hggp.hg.wd.constant.HgWdSqlConstant;
 import com.baosight.hggp.hg.wd.domain.HGWD001;
@@ -36,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;
 
 /**
@@ -227,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));
 			}
@@ -288,42 +286,41 @@ 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);
-		boolean isSourceAuth = !ProjectSourceEnum.SPARE.getCode().equals(parentId);
+		boolean isSpare = HgWdUtils.HgWd001.isSpare(parentId);
 		List<Map> results = new ArrayList();
 		Map queryMap = new HashMap<>();
 		queryMap.put("ename", ename);
 		queryMap.put(HGSC001.FIELD_project_source, parentId);
 		queryMap.put(HGSC001.FIELD_approval_status, HGConstant.ApprovalStatus.YS);
-		if (isSourceAuth && !isManager) {
+		if (!isSpare && !isManager) {
 			queryMap.put("userId", userId);
 		}
 		List<HGSC001> dbSc001s = dao.query("HGSC101.query", queryMap);
 		if (CollectionUtils.isEmpty(dbSc001s)) {
 			return results;
 		}
-		//List<String> projCodes = dbSc001s.stream().map(HGSC001::getProjCode).distinct().collect(Collectors.toList());
-		//List<HGWD003> hgwd003s = HGWDTools.HgWd003.list(projCodes);
 		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, isSourceAuth, null);
-			//Long count = hgwd003s.stream().filter(hgwd003 -> hgwd003.getFileId().equals(dbSc001.getProjCode())).count();
-
 			leafMap.put("projCode", dbSc001.getProjCode());
 			leafMap.put("projName", dbSc001.getProjName());
 			leafMap.put("ename", dbSc001.getProjCode());
 			leafMap.put("type", "1");
 			leafMap.put("leafLevel", "0");
 			leafMap.put("count", count);
-			leafMap.put("isAuth", isSourceAuth ? "1" : "0");
-			leafMap.put("filePath", ProjectSourceEnum.getByCode(parentId).getName()+"/"+text);
+			leafMap.put("isAuth", isSpare ? "0" : "1");
+			leafMap.put("filePath", ProjectSourceEnum.getByCode(parentId).getName() + "/" + text);
 			results.add(leafMap);
 		}
 		// 设置叶子节点
@@ -342,17 +339,15 @@ public class ServiceHGWD001D extends TreeService {
 	public List queryChildNode(String projCode, String parentId, String ename, String pageCode) {
 		List<Map> results = new ArrayList();
 		String userId = UserSessionUtils.getLoginName();
-		// 查询项目来源
-		HGSC001 dbSc001 = HGSCTools.Hgsc001.getByCode(projCode);
-		// 备件制造图不需要授权，true：需要权限
-		boolean isSourceAuth = !ProjectSourceEnum.SPARE.getCode().equals(dbSc001.getProjectSource());
+		// 查询项目来源，备件制造图不需要授权
+		boolean isSpare = HgWdUtils.HgWd001.isSpare(parentId, projCode);
 		// 是否文档管理员
 		boolean isManager = HgWdUtils.HgWd009.isManager();
 		Map queryMap = new HashMap();
 		queryMap.put("parentId", parentId);
 		queryMap.put("ename", ename);
 		// 递归查询有权限的文件夹，管理员和备件制造图不限制
-		if (!isManager && isSourceAuth) {
+		if (!isManager && !isSpare) {
 			queryMap.put("treeUserId", userId);
 		}
 		List<HGWD001> dbWd001s = dao.query(HGWD001.QUERY, queryMap);
@@ -363,8 +358,11 @@ public class ServiceHGWD001D extends TreeService {
 		// 查询目录授权人数
 		List<HGWD003> dbWd003s = HGWDTools.HgWd003.list(fileIds);
 		for (HGWD001 dbWd001 : dbWd001s) {
+			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);
-			int count = getChildCount(dbWd001.getFileId(), isManager, isSourceAuth, pageCode);
 			leafMap.put("projCode", dbWd001.getProjCode());
 			leafMap.put("projName", dbWd001.getProjName());
 			leafMap.put("ename", dbWd001.getProjCode());
@@ -372,10 +370,7 @@ 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 && isSourceAuth) {
+			if (!isManager && !isSpare) {
 				leafMap.put("isAuth", "1");
 				// 从已授权的信息中查找出自己
 				HGWD003 dbWd003 = dbWd003s == null ? null : dbWd003s.stream().filter(item
@@ -434,25 +429,23 @@ public class ServiceHGWD001D extends TreeService {
 	/**
 	 * 获取子级节点数量
 	 * @param fileId 目录ID
-	 * @param isSourceAuth true：需要权限
+	 * @param isSpare true：备件制造图
 	 * @return 节点数量
 	 */
-	public int getChildCount(String fileId, boolean isManager, boolean isSourceAuth, String pageCode) {
-		List<HGWD001> hgwd001List = HgWdUtils.HgWd001.queryChildren(fileId, isManager, isSourceAuth); //查询子级目录
-		List<String> childIds = Optional.ofNullable(hgwd001List).orElse(new ArrayList<>()).stream()
-				.map(HGWD001::getFileId).collect(Collectors.toList());
+	public int getChildCount(String fileId, boolean isManager, boolean isSpare, String pageCode) {
+		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);
 		int dbWd099s = fWd099s == null ? 0 : fWd099s.size();
 		int count = 0;
-		if ("HGWD002".equals(pageCode) && dbWd099s == 0){
+		if ("HGWD002".equals(pageCode) && dbWd099s == 0) {
 			return 0;
-		} else if (dbWd003List!=null && dbWd003List.size() > 0 && dbWd099s > 0){
+		} else if (dbWd003List != null && !dbWd003List.isEmpty() && dbWd099s > 0) {
 			count = 3;
-		}else if (dbWd003List!=null && dbWd003List.size() > 0){
+		} else if (dbWd003List != null && !dbWd003List.isEmpty()) {
 			count = 2;
-		}else if (dbWd099s > 0){
+		} else if (dbWd099s > 0) {
 			count = 1;
 		}
 		return count;

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,14 +95,31 @@ 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 isSourceAuth true：需要权限
+		 * @param isSpare true：备件制造图
 		 * @return
 		 */
-		public static List<HGWD001> queryChildren(String parentId, boolean isManager, boolean isSourceAuth) {
+		public static List<HGWD001> queryChildren(String parentId, boolean isManager, boolean isSpare) {
 			// 管理员或者备件制造图查询所有子节点；其余查询当前节点有权限的子节点
-			if (isManager || !isSourceAuth) {
+			if (isManager || isSpare) {
 				return HGWDTools.HgWd001.queryChildren(parentId);
 			} else {
 				return HGWDTools.HgWd001.queryChildrenByUser(parentId);
@@ -107,7 +127,6 @@ public class HgWdUtils {
 		}
 	}
 	
-	
 	/**
 	 * @author:songx
 	 * @date:2024/8/19,14:57

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

@@ -32,7 +32,6 @@
 			<EF:EFColumn ename="fieldCode" cname="字段英文名" enable="false" width="180" align="left"
 			             alias="a.fieldCode"/>
 			<EF:EFColumn ename="fieldName" cname="字段中文名" enable="false" width="180" align="left" sort="false"/>
-			<EF:EFColumn ename="viewSql" cname="视图语句" enable="false" width="200" align="left" sort="false"/>
 			<EF:EFColumn ename="aliasName" cname="字段别名" enable="false" width="160" align="left" sort="false"/>
 			<EF:EFColumn ename="sortNum" cname="排序" width="100" align="center" required="true" alias="a.sortNum"/>
 			<EF:EFColumn ename="createdName" cname="创建人" enable="false" align="center" sort="false"/>

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

@@ -29,7 +29,6 @@
 			<EF:EFColumn ename="tableName" cname="页面中文名" enable="false" width="140" align="left"/>
 			<EF:EFColumn ename="fieldCode" cname="字段英文名" enable="false" width="160" align="left"/>
 			<EF:EFColumn ename="fieldName" cname="字段中文名" enable="false" width="180" align="left"/>
-			<EF:EFColumn ename="viewSql" cname="视图语句" enable="false" width="200" align="left"/>
 			<EF:EFColumn ename="aliasName" cname="字段别名" enable="false" width="160" align="left"/>
 			<EF:EFColumn ename="sortNum" cname="排序" enable="false" width="80" align="center"/>
 		</EF:EFGrid>

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

@@ -26,9 +26,8 @@
 			<EF:EFColumn ename="tableName" cname="页面中文名" enable="false" width="140" align="left" sort="false"/>
 			<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="viewSql" cname="视图SQL" enable="false" width="200" 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/PZ/HGPZ021A.jsp

@@ -24,9 +24,6 @@
 			            required="true"/>
 		</div>
 		<div class="row">
-			<EF:EFInput ename="viewSql" cname="视图语句" blockId="result" row="0" colWidth="6" ratio="2:10"/>
-		</div>
-		<div class="row">
 			<EF:EFInput ename="aliasName" cname="别名" blockId="result" row="0" colWidth="6" ratio="2:10"
 			            required="true"/>
 		</div>

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>