Skip to content

H
hg-smart
Commit e8d73b2d by 宋祥
Options

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

parents ebf3655e 3e52189a
Showing with 7 additions and 3 deletions
src/main/java/com/baosight/hggp/hg/wd/service/ServiceHGWD001C.java
...@@ -120,8 +120,10 @@ public class ServiceHGWD001C extends ServiceBase { ...@@ -120,8 +120,10 @@ public class ServiceHGWD001C extends ServiceBase {
try { try {
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 fileName = MapUtils.getString(queryMap, HGWD001.FIELD_FILE_NAME); // 文档信息
String zipName = fileName + "_" + DateUtils.shortDateTime(); HGWD001 dbHg001 = HGWDTools.HgWd001.get(fileId);
AssertUtils.isNull(dbHg001, "文档不存在");
String zipName = dbHg001.getFileName() + "_" + DateUtils.shortDateTime();
List<String> docIds = ObjectUtils.listKey(inInfo, HGWD099.FIELD_DOC_ID); List<String> docIds = ObjectUtils.listKey(inInfo, HGWD099.FIELD_DOC_ID);
inInfo.set("url", Iplat4jUtils.compressFile(docIds, zipName)); inInfo.set("url", Iplat4jUtils.compressFile(docIds, zipName));
// 写入下载记录 // 写入下载记录
......
src/main/webapp/HG/WD/HGWD002.js
...@@ -163,6 +163,7 @@ $(function () { ...@@ -163,6 +163,7 @@ $(function () {
}, },
selectTreeNode: { selectTreeNode: {
treeId: '', treeId: '',
treeText: '',
projCode: '', projCode: '',
leafType: '', leafType: '',
downloadFlag: '0' downloadFlag: '0'
...@@ -294,6 +295,7 @@ let treeSelectClick = function (nodeData) { ...@@ -294,6 +295,7 @@ let treeSelectClick = function (nodeData) {
*/ */
let setTreeNodeValue = function (nodeData) { let setTreeNodeValue = function (nodeData) {
IPLATUI.EFTree.docTree.selectTreeNode.treeId = nodeData.id; IPLATUI.EFTree.docTree.selectTreeNode.treeId = nodeData.id;
IPLATUI.EFTree.docTree.selectTreeNode.treeText = nodeData.text;
IPLATUI.EFTree.docTree.selectTreeNode.projCode = nodeData.projCode; IPLATUI.EFTree.docTree.selectTreeNode.projCode = nodeData.projCode;
IPLATUI.EFTree.docTree.selectTreeNode.leafType = nodeData.leafType; IPLATUI.EFTree.docTree.selectTreeNode.leafType = nodeData.leafType;
IPLATUI.EFTree.docTree.selectTreeNode.downloadFlag = nodeData.downloadFlag == null ? 0 IPLATUI.EFTree.docTree.selectTreeNode.downloadFlag = nodeData.downloadFlag == null ? 0
......
src/main/webapp/HG/WD/HGWD002.jsp
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
<div id="right-pane" class="i-fit-height"> <div id="right-pane" class="i-fit-height">
<EF:EFRegion id="inqu" title="查询条件"> <EF:EFRegion id="inqu" title="查询条件">
<EF:EFInput ename="projCode" cname="项目代码" blockId="inqu_status" row="0" type="hidden"/> <EF:EFInput ename="projCode" cname="项目代码" blockId="inqu_status" row="0" type="hidden"/>
<EF:EFInput ename="fileId" cname="文档库id" blockId="inqu_status" row="0" type="hidden"/> <EF:EFInput ename="fileId" cname="文档ID" blockId="inqu_status" row="0" type="hidden"/>
<div class="row"> <div class="row">
<EF:EFSelect ename="fileType" cname="附件分类" blockId="inqu_status" row="0" colWidth="3" <EF:EFSelect ename="fileType" cname="附件分类" blockId="inqu_status" row="0" colWidth="3"
filter="contains"> filter="contains">
......
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