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

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

@@ -5,7 +5,6 @@ import com.baosight.hggp.core.dao.DaoUtils;
 import com.baosight.hggp.core.enums.DeleteFlagEnum;
 import com.baosight.hggp.core.tools.FileTools;
 import com.baosight.hggp.core.utils.Iplat4jUtils;
-import com.baosight.hggp.hg.cw.tools.HGCWTools;
 import com.baosight.hggp.hg.wd.domain.HGWD001;
 import com.baosight.hggp.hg.wd.domain.HGWD001C;
 import com.baosight.hggp.hg.wd.domain.HGWD002;
@@ -133,12 +132,15 @@ public class ServiceHGWD001C extends ServiceBase {
 	 * @param inInfo
 	 */
 	private void saveData(EiInfo inInfo) {
-		List<HGWD001C> fWd001cs = MapUtils.toDaoEPBases(inInfo, HGWD001C.class);
-		for (HGWD001C fWd001c : fWd001cs) {
-			AssertUtils.isEmpty(fWd001c.getFileId(), "文件ID不能为空");
+		Map queryMap = EiInfoUtils.getFirstRow(inInfo);
+		String fileId = MapUtils.getString(queryMap, HGWD001.FIELD_FILE_ID);
+		AssertUtils.isEmpty(fileId, "文件ID不能为空");
+		List<HGWD001C> fWd001Cs = MapUtils.toDaoEPBases(inInfo, HGWD001C.class);
+		for (HGWD001C fWd001c : fWd001Cs) {
 			// 下载记录+1
 			HGWDTools.HgWd099.downloadIncr(fWd001c.getDocId());
 			// 新增
+			fWd001c.setFileId(fileId);
 			fWd001c.setDeleteFlag(DeleteFlagEnum.UN_REMOVE.getCode());
 			DaoUtils.insert(HGWD001C.INSERT, fWd001c);
 		}

src/main/webapp/HG/CW/HGCW012.js

@@ -271,7 +271,7 @@ function contractDetailFunc(id) {
 
 function fileDetailFunc(id) {
     JSColorbox.open({
-        href: "HGCW999?methodName=initLoad&inqu_status-0-bizType=HT&inqu_status-0-matId=" + id + "&efParentFormEname=HGCW012",
+        href: "HGCW999?methodName=initLoad&inqu_status-0-bizType=PUR_RECEIPT&inqu_status-0-matId=" + id + "&efParentFormEname=HGCW012",
         title: "<div style='text-align: center;'>附件清单</div>",
         width: "80%",
         height: "80%",