Merge remote-tracking branch 'origin/dev' into dev

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

@@ -38,14 +38,10 @@ public class HGWD001 extends DaoEPBase {
 	public static final String FIELD_FILE_ID = "fileId";    		/* 文件ID*/
 	public static final String FIELD_FILE_TYPE = "fileType";    		/* 文件类型*/
 	public static final String FIELD_FILE_NAME = "fileName";    		/* 文件名称*/
-	public static final String FIELD_DOC_ID = "docId";    		/* 文件号*/
-	public static final String FIELD_DOC_NAME = "docName";    		/* 文件附件名称*/
 	public static final String FIELD_DOC_VERSION = "docVersion";    		/* 文件版本号*/
 	public static final String FIELD_STATUS = "status";    		/* 状态*/
 	public static final String FIELD_REMARK = "remark";    		/* 备注*/
 	public static final String FIELD_RELEASE_DATE = "releaseDate";  /* 发布时间*/
-	public static final String FIELD_PREVIEW_NUM = "previewNum";    		/* 预览次数*/
-	public static final String FIELD_DOWNLOAD_NUM = "downloadNum";    		/* 下载次数*/
 
 	public static final String COL_ID = "ID";
 	public static final String COL_ACCOUNT_CODE = "ACCOUNT_CODE";    		/* 企业编码*/
@@ -64,14 +60,10 @@ public class HGWD001 extends DaoEPBase {
 	public static final String COL_FILE_ID = "FILE_ID";    		/* 文件ID*/
 	public static final String COL_FILE_TYPE = "FILE_TYPE";    		/* 文件类型*/
 	public static final String COL_FILE_NAME = "FILE_NAME";    		/* 文件名称*/
-	public static final String COL_DOC_ID = "DOC_ID";    		/* 文件号*/
-	public static final String COL_DOC_NAME = "DOC_NAME";    		/* 文件附件名称*/
 	public static final String COL_DOC_VERSION = "DOC_VERSION";    		/* 文件版本号*/
 	public static final String COL_STATUS = "STATUS";    		/* 状态*/
 	public static final String COL_REMARK = "REMARK";    		/* 备注*/
 	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 QUERY = "HGWD001.query";
 	public static final String COUNT = "HGWD001.count";
@@ -97,14 +89,10 @@ public class HGWD001 extends DaoEPBase {
 	private String fileId = " ";		/* 文件ID*/
 	private String fileType = " ";		/* 文件类型*/
 	private String fileName = " ";		/* 文件名称*/
-	private String docId = " ";		/* 文件号*/
-	private String docName = " ";		/* 文件附件名称*/
 	private Integer docVersion = new Integer(0);		/* 文件版本号*/
 	private Integer status = 0;	/* 状态*/
 	private String remark = " ";		/* 备注*/
 	private String releaseDate = " ";		/* 发布时间*/
-	private Integer previewNum = new Integer(0);		/* 预览次数*/
-	private Integer downloadNum = new Integer(0);		/* 下载次数*/
 
 	/**
 	 * initialize the metadata.
@@ -181,14 +169,6 @@ public class HGWD001 extends DaoEPBase {
 		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);
@@ -205,14 +185,6 @@ public class HGWD001 extends DaoEPBase {
 		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);
-
 
 	}
 
@@ -496,38 +468,6 @@ public class HGWD001 extends DaoEPBase {
 		this.fileName = fileName;
 	}
 	/**
-	 * get the docId - 文件号.
-	 * @return the docId
-	 */
-	public String getDocId() {
-		return this.docId;
-	}
-
-	/**
-	 * set the docId - 文件号.
-	 *
-	 * @param docId - 文件号
-	 */
-	public void setDocId(String docId) {
-		this.docId = docId;
-	}
-	/**
-	 * get the docName - 文件附件名称.
-	 * @return the docName
-	 */
-	public String getDocName() {
-		return this.docName;
-	}
-
-	/**
-	 * set the docName - 文件附件名称.
-	 *
-	 * @param docName - 文件附件名称
-	 */
-	public void setDocName(String docName) {
-		this.docName = docName;
-	}
-	/**
 	 * get the docVersion - 文件版本号.
 	 * @return the docVersion
 	 */
@@ -592,38 +532,6 @@ public class HGWD001 extends DaoEPBase {
 		this.releaseDate = releaseDate;
 	}
 	/**
-	 * get the previewNum - 预览次数.
-	 * @return the previewNum
-	 */
-	public Integer getPreviewNum() {
-		return this.previewNum;
-	}
-
-	/**
-	 * set the previewNum - 预览次数.
-	 *
-	 * @param previewNum - 预览次数
-	 */
-	public void setPreviewNum(Integer previewNum) {
-		this.previewNum = previewNum;
-	}
-	/**
-	 * get the downloadNum - 下载次数.
-	 * @return the downloadNum
-	 */
-	public Integer getDownloadNum() {
-		return this.downloadNum;
-	}
-
-	/**
-	 * set the downloadNum - 下载次数.
-	 *
-	 * @param downloadNum - 下载次数
-	 */
-	public void setDownloadNum(Integer downloadNum) {
-		this.downloadNum = downloadNum;
-	}
-	/**
 	 * get the value from Map.
 	 *
 	 * @param map - source data map
@@ -648,14 +556,10 @@ public class HGWD001 extends DaoEPBase {
 		setFileId(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_FILE_ID)), fileId));
 		setFileType(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_FILE_TYPE)), fileType));
 		setFileName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_FILE_NAME)), fileName));
-		setDocId(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_DOC_ID)), docId));
-		setDocName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_DOC_NAME)), docName));
 		setDocVersion(NumberUtils.toInteger(StringUtils.toString(map.get(FIELD_DOC_VERSION)), docVersion));
 		setStatus(NumberUtils.toInteger(StringUtils.toString(map.get(FIELD_STATUS)), status));
 		setRemark(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_REMARK)), remark));
 		setReleaseDate(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_RELEASE_DATE)), releaseDate));
-		setPreviewNum(NumberUtils.toInteger(StringUtils.toString(map.get(FIELD_PREVIEW_NUM)), previewNum));
-		setDownloadNum(NumberUtils.toInteger(StringUtils.toString(map.get(FIELD_DOWNLOAD_NUM)), downloadNum));
 	}
 
 	/**
@@ -682,14 +586,10 @@ public class HGWD001 extends DaoEPBase {
 		map.put(FIELD_FILE_ID, StringUtils.toString(fileId, eiMetadata.getMeta(FIELD_FILE_ID)));
 		map.put(FIELD_FILE_TYPE, StringUtils.toString(fileType, eiMetadata.getMeta(FIELD_FILE_TYPE)));
 		map.put(FIELD_FILE_NAME, StringUtils.toString(fileName, eiMetadata.getMeta(FIELD_FILE_NAME)));
-		map.put(FIELD_DOC_ID, StringUtils.toString(docId, eiMetadata.getMeta(FIELD_DOC_ID)));
-		map.put(FIELD_DOC_NAME, StringUtils.toString(docName, eiMetadata.getMeta(FIELD_DOC_NAME)));
 		map.put(FIELD_DOC_VERSION, StringUtils.toString(docVersion, eiMetadata.getMeta(FIELD_DOC_VERSION)));
 		map.put(FIELD_STATUS, StringUtils.toString(status, eiMetadata.getMeta(FIELD_STATUS)));
 		map.put(FIELD_REMARK, StringUtils.toString(remark, eiMetadata.getMeta(FIELD_REMARK)));
 		map.put(FIELD_RELEASE_DATE, StringUtils.toString(releaseDate, eiMetadata.getMeta(FIELD_RELEASE_DATE)));
-		map.put(FIELD_PREVIEW_NUM, StringUtils.toString(previewNum, eiMetadata.getMeta(FIELD_PREVIEW_NUM)));
-		map.put(FIELD_DOWNLOAD_NUM, StringUtils.toString(downloadNum, eiMetadata.getMeta(FIELD_DOWNLOAD_NUM)));
 
 		return map;
 	}

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

@@ -7,6 +7,7 @@ import com.baosight.hggp.hg.cw.tools.HGCWTools;
 import com.baosight.hggp.hg.wd.constant.HgWdConstant;
 import com.baosight.hggp.hg.wd.domain.HGWD001;
 import com.baosight.hggp.hg.wd.domain.HGWD001B;
+import com.baosight.hggp.hg.wd.domain.HGWD002;
 import com.baosight.hggp.hg.wd.tools.HGWDTools;
 import com.baosight.hggp.util.CommonMethod;
 import com.baosight.hggp.util.EiInfoUtils;
@@ -54,13 +55,14 @@ public class ServiceHGWD001B extends ServiceBase {
 	 */
 	public void setFileInfo(EiInfo inInfo) {
 		Map queryRow = EiInfoUtils.getFirstRow(inInfo);
-		String fileId = MapUtils.getString(queryRow, HGWD001.FIELD_FILE_ID);
-		if (StringUtils.isBlank(fileId)) {
+		String fileId = MapUtils.getString(queryRow, HGWD002.FIELD_FILE_ID);
+		String docId = MapUtils.getString(queryRow, HGWD002.FIELD_DOC_ID);
+		if (StringUtils.isBlank(fileId) || StringUtils.isBlank(docId)) {
 			return;
 		}
 		EiBlock block = new EiBlock(EiConstant.queryBlock);
-		block.addRow(HGWDTools.HgWd001.get(fileId));
-		block.addBlockMeta(new HGWD001().eiMetadata);
+		block.addRow(HGWDTools.HgWd002.get(fileId, docId));
+		block.addBlockMeta(new HGWD002().eiMetadata);
 		inInfo.setBlock(block);
 	}
 	

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

@@ -6,6 +6,7 @@ import com.baosight.hggp.hg.cw.tools.HGCWTools;
 import com.baosight.hggp.hg.wd.domain.HGWD001;
 import com.baosight.hggp.hg.wd.domain.HGWD001B;
 import com.baosight.hggp.hg.wd.domain.HGWD001C;
+import com.baosight.hggp.hg.wd.domain.HGWD002;
 import com.baosight.hggp.hg.wd.tools.HGWDTools;
 import com.baosight.hggp.util.EiInfoUtils;
 import com.baosight.hggp.util.LogUtils;
@@ -51,13 +52,14 @@ public class ServiceHGWD001C extends ServiceBase {
 	 */
 	public void setFileInfo(EiInfo inInfo) {
 		Map queryRow = EiInfoUtils.getFirstRow(inInfo);
-		String fileId = MapUtils.getString(queryRow, HGWD001.FIELD_FILE_ID);
-		if (StringUtils.isBlank(fileId)) {
+		String fileId = MapUtils.getString(queryRow, HGWD002.FIELD_FILE_ID);
+		String docId = MapUtils.getString(queryRow, HGWD002.FIELD_DOC_ID);
+		if (StringUtils.isBlank(fileId) || StringUtils.isBlank(docId)) {
 			return;
 		}
 		EiBlock block = new EiBlock(EiConstant.queryBlock);
-		block.addRow(HGWDTools.HgWd001.get(fileId));
-		block.addBlockMeta(new HGWD001().eiMetadata);
+		block.addRow(HGWDTools.HgWd002.get(fileId, docId));
+		block.addBlockMeta(new HGWD002().eiMetadata);
 		inInfo.setBlock(block);
 	}
 	

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

@@ -20,14 +20,10 @@
         FILE_ID as "fileId",  <!-- 文件ID -->
         FILE_TYPE as "fileType",  <!-- 文件类型 -->
         FILE_NAME as "fileName",  <!-- 文件名称 -->
-        DOC_ID as "docId",  <!-- 文件号 -->
-        DOC_NAME as "docName",  <!-- 文件附件名称 -->
         DOC_VERSION as "docVersion",  <!-- 文件版本号 -->
         STATUS as "status",  <!-- 状态 -->
         REMARK as "remark", <!-- 备注 -->
-        RELEASE_DATE as "releaseDate",  <!-- 发布时间 -->
-        PREVIEW_NUM as "previewNum",  <!-- 预览次数 -->
-        DOWNLOAD_NUM as "downloadNum" <!-- 下载次数 -->
+        RELEASE_DATE as "releaseDate"  <!-- 发布时间 -->
     </sql>
 
     <sql id="condition">
@@ -82,12 +78,6 @@
 		<isNotEmpty prepend=" AND " property="fileName">
 			FILE_NAME LIKE CONCAT('%', #fileName#, '%')
 		</isNotEmpty>
-		<isNotEmpty prepend=" AND " property="docId">
-			DOC_ID = #docId#
-		</isNotEmpty>
-		<isNotEmpty prepend=" AND " property="docName">
-			DOC_NAME = #docName#
-		</isNotEmpty>
 		<isNotEmpty prepend=" AND " property="docVersion">
 			DOC_VERSION = #docVersion#
 		</isNotEmpty>
@@ -143,8 +133,6 @@
         FILE_ID,  <!-- 文件ID -->
         FILE_TYPE,  <!-- 文件类型 -->
         FILE_NAME,  <!-- 文件名称 -->
-        DOC_ID,  <!-- 文件号 -->
-        DOC_NAME,  <!-- 文件附件名称 -->
         DOC_VERSION,  <!-- 文件版本号 -->
         STATUS,  <!-- 状态 -->
         REMARK,  <!-- 备注 -->
@@ -153,7 +141,7 @@
         #accountCode#, #depCode#, #createdBy#, #createdName#, #createdTime#,
         #deleteFlag#, #companyCode#, #companyName#, #projCode#, #projName#,
         #fileId#, #fileType#, #fileName#,
-        #docId#, #docName#, #docVersion#, #status#, #remark#, #releaseDate#
+        #docVersion#, #status#, #remark#, #releaseDate#
         <selectKey resultClass="long" keyProperty="id">
             SELECT MAX(ID) AS "id" FROM ${hggpSchema}.HGWD001
         </selectKey>
@@ -171,8 +159,6 @@
         SET
         FILE_TYPE = #fileType#,   <!-- 文件类型 -->
         FILE_NAME = #fileName#,   <!-- 文件名称 -->
-        DOC_ID = #docId#,   <!-- 文件号 -->
-        DOC_NAME = #docName#,   <!-- 文件附件名称 -->
         DOC_VERSION = #docVersion#,   <!-- 文件版本号 -->
         STATUS = #status#,   <!-- 状态 -->
         REMARK = #remark#,  <!-- 备注 -->
@@ -191,23 +177,4 @@
         WHERE ID = #id#
     </update>
 
-    <!-- 预览自增 -->
-    <update id="previewIncr">
-        UPDATE ${hggpSchema}.HGWD001
-        SET
-        PREVIEW_NUM = PREVIEW_NUM + 1,
-        <include refid="SqlBase.updateRevise"/>
-        WHERE FILE_ID = #fileId#
-    </update>
-
-    <!-- 下载自增 -->
-    <update id="downloadIncr">
-        UPDATE ${hggpSchema}.HGWD001
-        SET
-        DOWNLOAD_NUM = DOWNLOAD_NUM + 1,
-        <include refid="SqlBase.updateRevise"/>
-        WHERE FILE_ID = #fileId#
-    </update>
-
-
 </sqlMap>

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

@@ -51,6 +51,9 @@
 		<isNotEmpty prepend=" AND " property="fileId">
 			FILE_ID = #fileId#
 		</isNotEmpty>
+        <isNotEmpty prepend=" AND " property="docId">
+            DOC_ID = #docId#
+        </isNotEmpty>
 	</sql>
 
     <sql id="orderBy">

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

@@ -51,6 +51,9 @@
 		<isNotEmpty prepend=" AND " property="fileId">
 			FILE_ID = #fileId#
 		</isNotEmpty>
+        <isNotEmpty prepend=" AND " property="docId">
+            DOC_ID = #docId#
+        </isNotEmpty>
 	</sql>
 
     <sql id="orderBy">

src/main/java/com/baosight/hggp/hg/wd/tools/HGWDTools.java

@@ -5,6 +5,7 @@ import com.baosight.hggp.core.dao.DaoUtils;
 import com.baosight.hggp.hg.wd.constant.HgWdSqlConstant;
 import com.baosight.hggp.hg.wd.domain.HGWD001;
 import com.baosight.hggp.hg.wd.domain.HGWD001A;
+import com.baosight.hggp.hg.wd.domain.HGWD002;
 import com.baosight.hggp.util.AssertUtils;
 import org.apache.commons.collections.CollectionUtils;
 
@@ -55,4 +56,28 @@ public class HGWDTools {
 		
 	}
 	
+	
+	/**
+	 * HGWD002 定义
+	 *
+	 * @author:songx
+	 * @date:2024/8/19,14:57
+	 */
+	public static class HgWd002 {
+		
+		/**
+		 * @param fileId
+		 * @param docId
+		 * @return
+		 */
+		public static HGWD002 get(String fileId, String docId) {
+			AssertUtils.isEmpty(fileId, "文件ID不能为空");
+			AssertUtils.isEmpty(docId, "附件ID不能为空");
+			Map queryMap = new HashMap();
+			queryMap.put(HGWD002.FIELD_FILE_ID, fileId);
+			queryMap.put(HGWD002.FIELD_DOC_ID, docId);
+			List<HGWD002> results = DaoBase.getInstance().query(HGWD002.QUERY, queryMap);
+			return CollectionUtils.isEmpty(results) ? null : results.get(0);
+		}
+	}
 }

src/main/webapp/HG/CG/HGCG002A.jsp

@@ -35,6 +35,11 @@
 			<EF:EFColumn ename="spec" cname="规格" enable="false" width="120" align="center"/>
 			<EF:EFColumn ename="purQty" cname="采购数量" width="120" align="right" format="{0:N3}" enable="false"/>
 			<EF:EFColumn ename="purWeight" cname="采购重量" width="120" align="right" format="{0:N3}" enable="false"/>
+			<EF:EFColumn ename="material" cname="材质" enable="false" width="80" align="center"/>
+			<EF:EFColumn ename="unit" cname="单位" enable="false" width="80" align="center"/>
+			<EF:EFColumn ename="length" cname="长(MM)" enable="false" width="80" align="right" format="{0:N3}"/>
+			<EF:EFColumn ename="width" cname="宽(MM)" enable="false" width="80" align="right" format="{0:N3}"/>
+			<EF:EFColumn ename="thick" cname="厚(MM)" enable="false" width="80" align="right" format="{0:N3}"/>
 			<EF:EFColumn ename="price" cname="单价" width="80" align="right" format="{0:N3}" required="true"/>
 			<EF:EFComboColumn ename="taxRate" cname="税率(%)" enable="true" width="80" align="center" required="true">
 				<EF:EFCodeOption codeName="hggp.cw.taxPoints" />
@@ -42,12 +47,6 @@
 			<EF:EFColumn ename="amount" cname="不含税金额" enable="false" width="80" align="right" format="{0:N3}"/>
 			<EF:EFColumn ename="taxAmount" cname="税额" enable="false" width="80" align="right" format="{0:N3}"/>
 			<EF:EFColumn ename="taxIncludeAmount" cname="含税金额" enable="false" width="80" align="right" format="{0:N3}"/>
-			<EF:EFColumn ename="material" cname="材质" enable="false" width="80" align="center"/>
-			<EF:EFColumn ename="unit" cname="单位" enable="false" width="80" align="center"/>
-			<EF:EFColumn ename="length" cname="长(MM)" enable="false" width="80" align="right" format="{0:N3}"/>
-			<EF:EFColumn ename="width" cname="宽(MM)" enable="false" width="80" align="right" format="{0:N3}"/>
-			<EF:EFColumn ename="thick" cname="厚(MM)" enable="false" width="80" align="right" format="{0:N3}"/>
-
 			<EF:EFColumn ename="createdName" cname="创建人" enable="false" width="100" align="center"/>
 			<EF:EFColumn ename="createdTime" cname="创建时间" enable="false" width="140" align="center"
 			             editType="datetime" parseFormats="['yyyyMMddHHmmss']"/>

src/main/webapp/HG/CG/HGCG002B.jsp

@@ -46,6 +46,11 @@
 			<EF:EFComboColumn ename="calculationMethod" cname="计算方式" enable="true" width="100" align="center" required="true">
 				<EF:EFCodeOption codeName="hggp.cg.calculationMethod" />
 			</EF:EFComboColumn>
+			<EF:EFColumn ename="material" cname="材质" width="80" align="center" required="true"/>
+			<EF:EFColumn ename="unit" cname="单位" enable="false" width="80" align="center"/>
+			<EF:EFColumn ename="length" cname="长(MM)" width="80" align="right" format="{0:N3}" required="true"/>
+			<EF:EFColumn ename="width" cname="宽(MM)" width="80" align="right" format="{0:N3}" required="true"/>
+			<EF:EFColumn ename="thick" cname="厚(MM)" width="80" align="right" format="{0:N3}" required="true"/>
 			<EF:EFColumn ename="price" cname="单价" width="80" align="right" format="{0:N3}" required="true"/>
 			<EF:EFComboColumn ename="taxRate" cname="税率(%)" enable="true" width="80" align="center" required="true">
 				<EF:EFCodeOption codeName="hggp.cw.taxPoints" />

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

@@ -8,6 +8,7 @@
 <EF:EFPage title="预览记录">
 	<EF:EFRegion id="inqu" title="查询条件">
 		<EF:EFInput cname="文件ID" ename="fileId" blockId="inqu_status" row="0" colWidth="3" type="hidden"/>
+		<EF:EFInput cname="附件ID" ename="docId" blockId="inqu_status" row="0" colWidth="3" type="hidden"/>
 		<div class="row">
 			<EF:EFInput cname="公司名称" ename="projName" blockId="inqu_status" row="0" colWidth="3" readonly="true"/>
 			<EF:EFInput cname="项目名称" ename="projName" blockId="inqu_status" row="0" colWidth="3" readonly="true"/>
@@ -23,6 +24,7 @@
 		<EF:EFGrid blockId="result" autoDraw="override" isFloat="true" checkMode="row">
 			<EF:EFColumn ename="id" cname="内码" hidden="true"/>
 			<EF:EFColumn ename="fileId" cname="文件ID" enable="false" width="100" align="center" hidden="true"/>
+			<EF:EFColumn ename="docId" cname="附件ID" enable="false" width="100" align="center" hidden="true"/>
 			<EF:EFColumn ename="createdName" cname="预览人" enable="false" width="100" align="center"/>
 			<EF:EFColumn ename="createdTime" cname="预览时间" enable="false" width="140" align="center"
 			             editType="datetime" parseFormats="['yyyyMMddHHmmss']"/>

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

@@ -8,6 +8,7 @@
 <EF:EFPage title="下载记录">
 	<EF:EFRegion id="inqu" title="查询条件">
 		<EF:EFInput cname="文件ID" ename="fileId" blockId="inqu_status" row="0" colWidth="3" type="hidden"/>
+		<EF:EFInput cname="附件ID" ename="docId" blockId="inqu_status" row="0" colWidth="3" type="hidden"/>
 		<div class="row">
 			<EF:EFInput cname="公司名称" ename="projName" blockId="inqu_status" row="0" colWidth="3" readonly="true"/>
 			<EF:EFInput cname="项目名称" ename="projName" blockId="inqu_status" row="0" colWidth="3" readonly="true"/>
@@ -23,6 +24,7 @@
 		<EF:EFGrid blockId="result" autoDraw="override" isFloat="true" checkMode="row">
 			<EF:EFColumn ename="id" cname="内码" hidden="true"/>
 			<EF:EFColumn ename="fileId" cname="文件ID" enable="false" width="100" align="center" hidden="true"/>
+			<EF:EFColumn ename="docId" cname="附件ID" enable="false" width="100" align="center" hidden="true"/>
 			<EF:EFColumn ename="createdName" cname="下载人" enable="false" width="100" align="center"/>
 			<EF:EFColumn ename="createdTime" cname="下载时间" enable="false" width="140" align="center"
 			             editType="datetime" parseFormats="['yyyyMMddHHmmss']"/>

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

@@ -11,11 +11,12 @@ $(function () {
 				field: "operator",
 				title: "操作",
 				template: function (model) {
+					let param = "'" + model.fileId + "', '" + model.docId + "'";
 					let template = '';
 					template += '<a style="cursor: pointer;display: inline-flex;justify-content: center;margin:auto 5px" '
-						+ 'onclick="showQueryRecord(\'' + model.fileId + '\')" >预览记录</a>';
+						+ 'onclick="showQueryRecord(' + param + ')" >预览记录</a>';
 					template += '<a style="cursor: pointer;display: inline-flex;justify-content: center;margin:auto 5px" '
-						+ 'onclick="showDownloadRecord(\'' + model.fileId + '\')" >下载记录</a>';
+						+ 'onclick="showDownloadRecord(' + param + ')" >下载记录</a>';
 					return template;
 				}
 			}, {
@@ -59,10 +60,13 @@ let query = function () {
 
 /**
  * 显示查询记录
+ *
+ * @param fileId
+ * @param docId
  */
-let showQueryRecord = function (fileId) {
+let showQueryRecord = function (fileId, docId) {
 	JSColorbox.open({
-		href: "HGWD001B?inqu_status-0-fileId=" + fileId,
+		href: "HGWD001B?inqu_status-0-fileId=" + fileId + "&inqu_status-0-docId=" + docId,
 		title: "<div style='text-align: center;'>预览记录</div>",
 		width: "80%",
 		height: "80%",
@@ -71,10 +75,13 @@ let showQueryRecord = function (fileId) {
 
 /**
  * 显示下载记录
+ *
+ * @param fileId
+ * @param docId
  */
-let showDownloadRecord = function (fileId) {
+let showDownloadRecord = function (fileId, docId) {
 	JSColorbox.open({
-		href: "HGWD001C?inqu_status-0-fileId=" + fileId,
+		href: "HGWD001C?inqu_status-0-fileId=" + fileId + "&inqu_status-0-docId=" + docId,
 		title: "<div style='text-align: center;'>下载记录</div>",
 		width: "80%",
 		height: "80%",