Commit 3f13d5b0 by liuyang

2024-10-16 文档库可预览未发布附件

parent 8b205365
...@@ -10,6 +10,7 @@ import com.baosight.hggp.hg.wd.utils.HgWdUtils; ...@@ -10,6 +10,7 @@ import com.baosight.hggp.hg.wd.utils.HgWdUtils;
import com.baosight.hggp.util.EiInfoUtils; import com.baosight.hggp.util.EiInfoUtils;
import com.baosight.hggp.util.LogUtils; import com.baosight.hggp.util.LogUtils;
import com.baosight.hggp.util.MapUtils; import com.baosight.hggp.util.MapUtils;
import com.baosight.hggp.util.StringUtils;
import com.baosight.iplat4j.core.ei.EiInfo; import com.baosight.iplat4j.core.ei.EiInfo;
import com.baosight.iplat4j.core.service.impl.ServiceEPBase; import com.baosight.iplat4j.core.service.impl.ServiceEPBase;
import org.springframework.util.CollectionUtils; import org.springframework.util.CollectionUtils;
...@@ -52,10 +53,11 @@ public class ServiceHGWD002A extends ServiceEPBase { ...@@ -52,10 +53,11 @@ public class ServiceHGWD002A extends ServiceEPBase {
Map queryMap = EiInfoUtils.getFirstRow(inInfo); Map queryMap = EiInfoUtils.getFirstRow(inInfo);
String fileId = MapUtils.getString(queryMap, HGWD001.FIELD_FILE_ID); String fileId = MapUtils.getString(queryMap, HGWD001.FIELD_FILE_ID);
String node = MapUtils.getString(queryMap, CommonConstant.Field.NODE); String node = MapUtils.getString(queryMap, CommonConstant.Field.NODE);
String status = MapUtils.getString(queryMap, HGWD001.FIELD_STATUS);
if (CommonConstant.Field.ROOT.equals(node) || CommonConstant.Field.ROOT2.equals(node)) { if (CommonConstant.Field.ROOT.equals(node) || CommonConstant.Field.ROOT2.equals(node)) {
inInfo.addBlock(node).setRows(queryTopNode(node, fileId)); inInfo.addBlock(node).setRows(queryTopNode(node, fileId));
} else { } else {
inInfo.addBlock(node).setRows(queryChildNode(node)); inInfo.addBlock(node).setRows(queryChildNode(node,status));
} }
} catch (Exception e) { } catch (Exception e) {
LogUtils.setMsg(inInfo, e, "查询节点失败"); LogUtils.setMsg(inInfo, e, "查询节点失败");
...@@ -91,7 +93,7 @@ public class ServiceHGWD002A extends ServiceEPBase { ...@@ -91,7 +93,7 @@ public class ServiceHGWD002A extends ServiceEPBase {
* @param parentId * @param parentId
* @return * @return
*/ */
public List queryChildNode(String parentId) { public List queryChildNode(String parentId, String status) {
List<Map> results = new ArrayList(); List<Map> results = new ArrayList();
Map queryMap = new HashMap(); Map queryMap = new HashMap();
queryMap.put("fileId", parentId); queryMap.put("fileId", parentId);
...@@ -101,6 +103,10 @@ public class ServiceHGWD002A extends ServiceEPBase { ...@@ -101,6 +103,10 @@ public class ServiceHGWD002A extends ServiceEPBase {
if (!(isSpare || HgWdUtils.HgWd009.isManager())) { if (!(isSpare || HgWdUtils.HgWd009.isManager())) {
queryMap.put("userId", UserSessionUtils.getLoginName()); queryMap.put("userId", UserSessionUtils.getLoginName());
} }
if (StringUtils.isEmpty(status) || !status.equals(HgWdConstant.FileStatus.S_0.toString())){
queryMap.put(HGWD001.FIELD_STATUS, HgWdConstant.FileStatus.S_1);
}
queryMap.put(HGWD001.FIELD_STATUS, HgWdConstant.FileStatus.S_1); queryMap.put(HGWD001.FIELD_STATUS, HgWdConstant.FileStatus.S_1);
queryMap.put("orderBy", "B.DOC_TYPE ASC, B.DOC_NAME ASC"); queryMap.put("orderBy", "B.DOC_TYPE ASC, B.DOC_NAME ASC");
List<HGWD002> dbWd002s = dao.query(HGWD002.QUERY, queryMap); List<HGWD002> dbWd002s = dao.query(HGWD002.QUERY, queryMap);
......
...@@ -1017,7 +1017,7 @@ function saveProtFunc() { ...@@ -1017,7 +1017,7 @@ function saveProtFunc() {
*/ */
let preview = function () { let preview = function () {
let fileId = IPLATUI.EFTree.categoryTree.selectTreeNode.fileId; let fileId = IPLATUI.EFTree.categoryTree.selectTreeNode.fileId;
let url = "HGWD002A?inqu_status-0-fileId=" + fileId; let url = "HGWD002A?inqu_status-0-fileId=" + fileId+"&inqu_status-0-status=0";
window.open(url, '_blank'); window.open(url, '_blank');
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment