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

src/main/java/com/baosight/hggp/core/extapp/decheng/api/DcOpenApi.java

@@ -128,7 +128,7 @@ public class DcOpenApi {
 		dataJsons.add(DcApiUtils.buildValueJson("title", title));
 		dataJsons.add(DcApiUtils.buildValueJson("sort2", 451));   //  451:默认分类
 		dataJsons.add(DcApiUtils.buildValueJson("intro", content));
-		dataJsons.add(DcApiUtils.buildValueJson("member", 1));  // 0：全部，1: 不分，-1：私密
+		dataJsons.add(DcApiUtils.buildValueJson("member1", 1));  // 0：全部，1: 不分，-1：私密
 		dataJsons.add(DcApiUtils.buildValueJson("share", ords));
 		String param = JSON.toJSONString(DcApiUtils.buildParamJson(dataJsons, "__sys_dosave"));
 		String result = HttpUtils.post(DeChengConst.INTERACTION_ADD, param, HttpUtils.JSON_MEDIA_TYPE);

src/main/java/com/baosight/hggp/hg/sc/tools/HGSCTools.java

@@ -393,39 +393,63 @@ public class HGSCTools {
         }
 
         public static void add(List<HGSC004A> arrayList, String materialId) {
-            List<HGSC004> results = DaoBase.getInstance().query(HGSC004.QUERY, new HashMap<String,Object>(){
-                {put("id",materialId);}
-            });
-            AssertUtils.isEmpty(results, "物料清单不存在！");
+            HGSC004 hgsc004 = Hgsc004.getId(materialId);
+            List<HGSC004A> hgsc004aList = Optional.ofNullable(
+                    list(new HashMap<String,Object>(){{put(HGSC004A.FIELD_material_id,materialId);}})).orElse(new ArrayList<>());
+            AssertUtils.isEmpty(Collections.singleton(hgsc004), "物料清单不存在,添加失败！");
+            AssertUtils.isTrue(hgsc004.getMaterialStatus()==2 || hgsc004.getApprovalStatus()==2, "物料清单已提交或已审核，无法添加！");
             for (HGSC004A hgsc004a : arrayList){
-                //HGSC004A hgsc004a = new HGSC004A();
-                //hgsc004a.fromMap(resultRow);
-                hgsc004a.setCompanyCode(results.get(0).getCompanyCode());
-                hgsc004a.setCompanyName(results.get(0).getCompanyName());
-                hgsc004a.setDepCode(results.get(0).getDepCode());
-                hgsc004a.setDepName(results.get(0).getDepName());
+                hgsc004a.setCompanyCode(hgsc004.getCompanyCode());
+                hgsc004a.setCompanyName(hgsc004.getCompanyName());
+                hgsc004a.setDepCode(hgsc004.getDepCode());
+                hgsc004a.setDepName(hgsc004.getDepName());
                 hgsc004a.setProductCode(hgsc004a.getProjCodePrefix().trim().concat(hgsc004a.getProductCode()));
                 hgsc004a.setProductName(hgsc004a.getProjNamePrefix().trim().concat(hgsc004a.getProductName()));
                 if (hgsc004a.getParentProdCode().trim().isEmpty()){
-                    hgsc004a.setParentProdCode(results.get(0).getProjCode());
-                    hgsc004a.setParentProdName(results.get(0).getProjName());
-                    hgsc004a.setMaterialId(results.get(0).getId());
+                    hgsc004a.setParentProdCode(hgsc004.getProjCode());
+                    hgsc004a.setParentProdName(hgsc004.getProjName());
+                    hgsc004a.setMaterialId(hgsc004.getId());
                     hgsc004a.setLv(3);
                 }else{
-                    Map<String,Object> paramMap = new HashMap<>();
-                    paramMap.put("companyCode", hgsc004a.getCompanyCode());
-                    paramMap.put("projCode", hgsc004a.getProjCode());
-                    paramMap.put("lv", 3);
-                    paramMap.put("productCode", hgsc004a.getProjCodePrefix().trim().concat(hgsc004a.getParentProdCode()));
-                    List<HGSC004A> hgsc004aList = list(paramMap);
-                    AssertUtils.isEmpty(hgsc004aList, String.format("父节点-产品编号[%s]数据不存在，导入失败！",hgsc004a.getProjCodePrefix().trim().concat(hgsc004a.getParentProdCode())));
-                    hgsc004a.setMaterialId(results.get(0).getId());
+                    /*Map<String,Object> paramMap = new HashMap<>();
+                    paramMap.put(HGSC004A.FIELD_company_code, hgsc004a.getCompanyCode());
+                    paramMap.put(HGSC004A.FIELD_proj_code, hgsc004a.getProjCode());
+                    paramMap.put(HGSC004A.FIELD_lv, 3);
+                    paramMap.put(HGSC004A.FIELD_product_code, hgsc004a.getProjCodePrefix().trim().concat(hgsc004a.getParentProdCode()));*/
+                    /*List<HGSC004A> hgsc004as = hgsc004aList.stream().filter(o ->
+                                    o.getProductCode().equals(hgsc004a.getProjCodePrefix().trim().concat(hgsc004a.getParentProdCode()))
+                                            && o.getLv() == 3
+                                            && o.getProjCode().equals(hgsc004a.getProjCode())
+                                            && o.getCompanyCode().equals(hgsc004a.getCompanyCode())
+                            ).collect(Collectors.toList());*/
+                    AssertUtils.isEmpty(hgsc004a.getParentProdCode(), String.format("父节点-产品编号[%s]数据不存在，导入失败！",hgsc004a.getProjCodePrefix().trim().concat(hgsc004a.getParentProdCode())));
+                    hgsc004a.setMaterialId(hgsc004.getId());
                     hgsc004a.setLv(4);
                     hgsc004a.setParentProdCode(hgsc004a.getProjCodePrefix().trim().concat(hgsc004a.getParentProdCode()));
                     hgsc004a.setParentProdName(hgsc004a.getProjNamePrefix().trim().concat(hgsc004a.getParentProdName()));
                 }
                 checkSaveData(hgsc004a);
                 addEntity(hgsc004a);
+                if (hgsc004a.getLv() == 3){
+                    DaoUtils.insert(HGSC004A.INSERT, hgsc004a);
+                }else {
+                    List<HGSC004A> hgsc004AS= hgsc004aList.stream()
+                            .filter(o -> o.getLv() == 4
+                                    && o.getCompanyCode().equals(hgsc004a.getCompanyCode())
+                                    && o.getProjCode().equals(hgsc004a.getProjCode())
+                                    && o.getParentProdCode().equals(hgsc004a.getParentProdCode())
+                                    && o.getProductId().equals(hgsc004a.getProductId())
+                                    && o.getProductCode().equals(hgsc004a.getProductCode())
+                            ).collect(Collectors.toList());
+                    if (!CollectionUtils.isEmpty(hgsc004AS)){
+                        hgsc004AS.get(0).setQuantity(hgsc004a.getQuantity());
+                        hgsc004AS.get(0).setSingleWeight(hgsc004a.getSingleWeight());
+                        hgsc004AS.get(0).setTotalWeight(hgsc004a.getTotalWeight());
+                        DaoUtils.update(HGSC004A.UPDATE, hgsc004a);
+                    }else {
+                        DaoUtils.insert(HGSC004A.INSERT, hgsc004a);
+                    }
+                }
             }
 
         }
@@ -435,15 +459,12 @@ public class HGSCTools {
             /*if(hgsc004a.getLv().intValue() < 4){
                 hgsc004a.setLv(hgsc004a.getLv() + 1);
             }*/
-            if(hgsc004a.getLv().intValue() == 3){
-                hgsc004a.setLeaf(2);
-            }else{
-                hgsc004a.setLeaf(1);
-            }
             hgsc004a.setProductStatus(HGConstant.ProductStatus.WTJ);
-            if(hgsc004a.getLv().intValue() == 3){
+            if(hgsc004a.getLv() == 3){
+                hgsc004a.setLeaf(2);
                 hgsc004a.setProductType(ProductTypeEnum.STRUCT.getCode().toString());
             }else{
+                hgsc004a.setLeaf(1);
                 hgsc004a.setProductType(ProductTypeEnum.PART.getCode().toString());
             }
             if (hgsc004a.getQuantity().compareTo(BigDecimal.ZERO) == 0){
@@ -480,7 +501,7 @@ public class HGSCTools {
             hgsc004a.setLength(pz005.getLength());
             hgsc004a.setWidth(pz005.getWidth());
             hgsc004a.setThick(pz005.getThick());
-            DaoUtils.insert(HGSC004A.INSERT, hgsc004a);
+            //DaoUtils.insert(HGSC004A.INSERT, hgsc004a);
             //主表全部提交时需要有改变状态
             /*if(hgsc004.getMaterialStatus().intValue() == HGConstant.MaterialStatus.QBTJ){
                 hgsc004a.setChangeType(HGConstant.ChangeType.ZJ);
@@ -504,14 +525,14 @@ public class HGSCTools {
                 AssertUtils.isTrue(hgsc003.getBlueprintStatus().compareTo(HGConstant.EnablingStatus.TY) == 0,"蓝图已停用不可修改！");
             }*/
             //为构件的需要验证是否已经存在了，不能重复添加
-            if(hgsc004a.getLv().intValue() == 3){
+            if(hgsc004a.getLv() == 3){
                 Map<String,Object> mapA = new HashMap<>();
-                mapA.put("materialId",hgsc004a.getMaterialId());
-                mapA.put("productId",hgsc004a.getProductId());
-                mapA.put("parentProdCode",hgsc004a.getParentProdCode());
-                mapA.put("notId",hgsc004a.getId());
-                List<HGSC004A> hgsc004AList = DaoBase.getInstance().query(HGSC004A.QUERY,mapA);
-                AssertUtils.isTrue(!org.springframework.util.CollectionUtils.isEmpty(hgsc004AList), "已存在构建"+hgsc004a.getProductCode()+"-"+hgsc004a.getProductName());
+                mapA.put(HGSC004A.FIELD_material_id,hgsc004a.getMaterialId());
+                //mapA.put(HGSC004A.FIELD_product_id,hgsc004a.getProductId());
+                mapA.put(HGSC004A.FIELD_parent_prod_code,hgsc004a.getParentProdCode());
+                mapA.put(HGSC004A.FIELD_product_code,hgsc004a.getProductCode());
+                List<HGSC004A> hgsc004AList = list(mapA);
+                AssertUtils.isTrue(!CollectionUtils.isEmpty(hgsc004AList), String.format("已存在构建%s-%s",hgsc004a.getProductCode(),hgsc004a.getProductName()));
             }
             AssertUtils.isEmpty(UserSessionUtils.getAccountCode(), "当前用户未绑定公司，无法操作数据，请联系管理员！");
             //AssertUtils.isEmpty(UserSessionUtils.getOrgId(), "当前用户未绑定部门，无法操作数据，请联系管理员！");

src/main/java/com/baosight/hggp/hg/wd/constant/HgWdConstant.java

@@ -36,4 +36,14 @@ public class HgWdConstant {
 		public static final String C = "C";
 	}
 
+	/**
+	 * 操作状态
+	 */
+	public static class OperStatus {
+
+		//新增
+		public static final Integer S_0 = 0;
+		//变更
+		public static final Integer S_1 = 1;
+	}
 }

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

@@ -37,6 +37,7 @@ public class HGWD099 extends DaoEPBase {
     public static final String FIELD_RELEASE_DATE = "releaseDate";  /* 发布时间*/
     public static final String FIELD_DOC_VERSION = "docVersion";    		/* 文件版本号*/
     public static final String FIELD_DOC_TYPE = "docType";   		/* 文件类型*/
+    public static final String FIELD_OPER_STATUS = "operStatus";   		/* 是否变更 0-否 1-是*/
 
     public static final String COL_ID = "ID";
     public static final String COL_COMPANY_CODE = "COMPANY_CODE";    		/* 企业编码 预留*/
@@ -85,6 +86,7 @@ public class HGWD099 extends DaoEPBase {
     private String releaseDate = " ";		/* 发布时间*/
     private Integer docVersion = new Integer(0);		/* 文件版本号*/
     private String docType = " ";		/* 文件类型*/
+    private Integer operStatus = new Integer(0);
 
     /**
      * initialize the metadata.
@@ -172,6 +174,10 @@ public class HGWD099 extends DaoEPBase {
         eiColumn = new EiColumn(FIELD_DOC_TYPE);
         eiColumn.setDescName("文件类型");
         eiMetadata.addMeta(eiColumn);
+
+        eiColumn = new EiColumn(FIELD_OPER_STATUS);
+        eiColumn.setDescName("操作状态");
+        eiMetadata.addMeta(eiColumn);
     }
 
     /**
@@ -471,6 +477,14 @@ public class HGWD099 extends DaoEPBase {
         this.docType = docType;
     }
 
+    public Integer getOperStatus() {
+        return operStatus;
+    }
+
+    public void setOperStatus(Integer operStatus) {
+        this.operStatus = operStatus;
+    }
+
     /**
      * get the value from Map.
      *
@@ -499,6 +513,7 @@ public class HGWD099 extends DaoEPBase {
         setDocVersion(NumberUtils.toInteger(StringUtils.toString(map.get(FIELD_DOC_VERSION)), docVersion));
         setReleaseDate(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_RELEASE_DATE)), releaseDate));
         setDocType(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_DOC_TYPE)), docType));
+        setOperStatus(NumberUtils.toInteger(StringUtils.toString(map.get(FIELD_OPER_STATUS)), operStatus));
     }
 
     /**
@@ -528,6 +543,7 @@ public class HGWD099 extends DaoEPBase {
         map.put(FIELD_DOC_VERSION, StringUtils.toString(docVersion, eiMetadata.getMeta(FIELD_DOC_VERSION)));
         map.put(FIELD_RELEASE_DATE, StringUtils.toString(releaseDate, eiMetadata.getMeta(FIELD_RELEASE_DATE)));
         map.put(FIELD_DOC_TYPE, StringUtils.toString(docType, eiMetadata.getMeta(FIELD_DOC_TYPE)));
+        map.put(FIELD_OPER_STATUS, StringUtils.toString(operStatus, eiMetadata.getMeta(FIELD_OPER_STATUS)));
 
         return map;
     }

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

@@ -203,6 +203,7 @@ public class ServiceHGWD001 extends ServiceEPBase {
                 hgwd099.fromMap(map);
                 hgwd099.setStatus(HgWdConstant.FileStatus.S_1);
                 hgwd099.setReleaseDate(DateUtils.shortDateTime());
+                hgwd099.setOperStatus(HgWdConstant.OperStatus.S_0);
                 List<HGWD003> listByFile = HGWDTools.HgWd003.listByFile(hgwd099.getBizId());
                 List hgwd003s = listByFile.stream().map(HGWD003::getUserId).distinct().collect(Collectors.toList());
                 AssertUtils.isTrue(hgwd003s.size() <= 1, "文件未分配人员，请先分配人员！");
@@ -221,7 +222,10 @@ public class ServiceHGWD001 extends ServiceEPBase {
                 hgwd001.setRemark(changeContent.trim().length()==0?"附件发布":changeContent);
                 DaoUtils.update(HGWD001.RELEASE_DATE, hgwd001);
             }
-            HGWDTools.interaction(hgwd001,strFileName.append("变更内容：").append(changeContent).toString());
+            if (StringUtils.isNotEmpty(changeContent)) {
+                strFileName.append("变更内容：").append(changeContent);
+            }
+            HGWDTools.interaction(hgwd001,strFileName.toString());
 
             inInfo.setStatus(EiConstant.STATUS_SUCCESS);
             inInfo.setMsgByKey("ep.1000", new String[]{String.valueOf(i), I18nMessages.getText("label.update", "发布成功")});
@@ -263,6 +267,7 @@ public class ServiceHGWD001 extends ServiceEPBase {
                 hgwd099.setDocName(resultRow.get(HGWD099.FIELD_DOC_NAME).toString());
                 hgwd099.setDocType(resultRow.get(HGWD099.FIELD_DOC_TYPE).toString());
                 hgwd099.setStatus(HgWdConstant.FileStatus.S_0);
+                hgwd099.setOperStatus(HgWdConstant.OperStatus.S_1);
                 DaoUtils.insert(HGWD099.UPDATE, hgwd099);
             }
             HGWDTools.interaction(hgwd001,strFileName.substring(0,strFileName.length()-1));
@@ -296,6 +301,7 @@ public class ServiceHGWD001 extends ServiceEPBase {
             hgwd001a.setChangeStartCode(hgwd099.getDocId());
             hgwd001a.setChangeStart(hgwd099.getDocName());
         }else if (ChangeTypeEnum.RELEASE.getCode().equals(type)){
+            hgwd001a.setChangeType(ChangeTypeEnum.RELEASE.getCode());
             hgwd001a.setChangeContent(hgwd001.getRemark().trim().length()==0?"附件发布":hgwd001.getRemark().trim());
             hgwd001a.setChangeStart("V".concat(hgwd001.getDocVersion()+""));
             hgwd001a.setChangeEnd("V".concat(hgwd001.getDocVersion()+1+""));

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

@@ -21,10 +21,7 @@ import com.baosight.iplat4j.core.ei.EiInfo;
 import com.baosight.iplat4j.core.service.impl.ServiceEPBase;
 import com.baosight.iplat4j.ed.util.SequenceGenerator;
 
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -69,6 +66,7 @@ public class ServiceHGWD001E extends ServiceEPBase {
         try {
             List<Map> resultRows = inInfo.getBlock(EiConstant.resultBlock).getRows();
             List<Map<String, Object>> edcm01List = Iplat4jTools.EdCm01.list("hggp.hgwd.fileType");
+            List<HGWD001> hgwd001s = new ArrayList<>();
             // 写入数据
             for (Map resultRow : resultRows) {
                 HGWD001 hgwd001 = new HGWD001();
@@ -79,7 +77,9 @@ public class ServiceHGWD001E extends ServiceEPBase {
                 } else {
                     this.modify(hgwd001,edcm01List);
                 }
+                hgwd001s.add(hgwd001);
             }
+            inInfo.getBlock(EiConstant.resultBlock).setRows(hgwd001s);
             inInfo.setStatus(EiConstant.STATUS_DEFAULT);
             inInfo.setMsg("操作成功！本次对[" + resultRows.size() + "]条数据保存成功!");
         } catch (Exception e) {

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

@@ -64,7 +64,7 @@ public class ServiceHGWD099 extends ServiceEPBase {
     public EiInfo query(EiInfo inInfo) {
         try {
             Map queryRow =EiInfoUtils.getFirstRow(inInfo);
-            if (StringUtils.isNotEmpty(queryRow.get(HGWD001.FIELD_FILE_ID).toString())){
+           if (StringUtils.isNotEmpty(queryRow.get(HGWD001.FIELD_PARENT_ID).toString())){
                 inInfo = super.query(inInfo, HGWD099.QUERY, new HGWD099());
             }
         } catch (Throwable e) {

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

@@ -21,7 +21,8 @@
         PREVIEW_NUM as "previewNum",  <!-- 预览次数 -->
         DOWNLOAD_NUM as "downloadNum", <!-- 下载次数 -->
         DOC_VERSION as "docVersion",  <!-- 文件版本号 -->
-        RELEASE_DATE as "releaseDate"  <!-- 发布时间 -->
+        RELEASE_DATE as "releaseDate",  <!-- 发布时间 -->
+        OPER_STATUS as "operStatus"
     </sql>
 
     <sql id="condition">
@@ -62,6 +63,9 @@
         <isNotEmpty prepend=" AND " property="deleteFlag">
             DELETE_FLAG in <iterate close=")" open="(" conjunction="," property="deleteFlag">#deleteFlag[]#</iterate>
         </isNotEmpty>
+        <isNotEmpty prepend=" AND " property="operStatus">
+            OPER_STATUS = #operStatus#
+        </isNotEmpty>
     </sql>
 
     <sql id="customCondition">
@@ -119,10 +123,11 @@
         DOC_TYPE,  <!-- 文件名称 -->
         STATUS,
         DOC_VERSION,
-        RELEASE_DATE
+        RELEASE_DATE,
+        OPER_STATUS
         ) VALUES (
         #accountCode#, #depCode#, #createdBy#, #createdName#, #createdTime#,
-        #deleteFlag#, #bizType#, #bizId#, #docId#, #docName#, #docType#, #status#, #docVersion#, #releaseDate#
+        #deleteFlag#, #bizType#, #bizId#, #docId#, #docName#, #docType#, #status#, #docVersion#, #releaseDate#, #operStatus#
         )
     </insert>
 
@@ -155,6 +160,7 @@
         STATUS = #status#,
         DOC_VERSION = DOC_VERSION + 1, <!--版本号-->
         RELEASE_DATE = #releaseDate#,  <!--发布时间-->
+        OPER_STATUS = #operStatus#,
         UPDATED_BY = #updatedBy#,   <!-- 修改人 -->
         UPDATED_NAME = #updatedName#,   <!-- 修改人名称 -->
         UPDATED_TIME = #updatedTime#   <!-- 修改时间 -->
@@ -177,6 +183,7 @@
         RELEASE_DATE = #releaseDate#,  <!--发布时间-->
         DOC_VERSION = DOC_VERSION + 1, <!--版本号-->
         STATUS = #status#,   <!-- 状态 -->
+        OPER_STATUS = #operStatus#,
         <include refid="SqlBase.updateRevise"/>
         WHERE ID = #id#
     </update>

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

@@ -271,7 +271,7 @@ public class HGWDTools {
 			if (Objects.nonNull(hgwd001)){
 				List<HGWD003> listByFile = HGWDTools.HgWd003.listByFile(hgwd001.getFileId()); //获取文件下的权限人员
 
-				HGPZ009 hgpz009 = HGPZTools.HgPz009.getByCode(hgwd001.getAccountCode());
+				//HGPZ009 hgpz009 = HGPZTools.HgPz009.getByCode(hgwd001.getAccountCode());
 
 				List<String> userIds = listByFile.stream().filter(item -> !item.getUserId().equals(UserSessionUtils.getUserId()) && item.getIsProjectManager() == 1)
 						.map(HGWD003::getExtId)

src/main/java/com/baosight/hggp/hg/xs/sql/HGXSDataAuth.xml

@@ -43,6 +43,13 @@
         <isNotEmpty prepend=" AND " property="accountCode">
             A.ACCOUNT_CODE = #accountCode#
         </isNotEmpty>
+        <!-- 0：不启用角色权限，1或者空：启用-->
+        <isNotEqual property="enableRoleAuth" compareValue="0">
+            <include refid="HGXSDataAuth.roleAuthConditionA"/>
+        </isNotEqual>
+    </sql>
+
+    <sql id="roleAuthConditionA">
         <!-- 无权限时使用 -->
         <isNotEmpty prepend=" AND " property="authDepCode">
             A.DEP_CODE = #authDepCode#

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

@@ -64,14 +64,14 @@
 					<EF:EFInput cname="文件名称" ename="docName" blockId="inqu_status" row="0" colWidth="3" />
 				</div>
 			</EF:EFRegion>
-			<EF:EFRegion id="result" title="附件详情" fitHeight="true">
+			<EF:EFRegion id="result" title="明细信息" fitHeight="true">
 				<EF:EFGrid blockId="result" autoDraw="no" personal="true" serviceName="HGWD099" queryMethod="query"
 				           deleteMethod="delete">
 					<EF:EFColumn ename="id" cname="ID" hidden="true"/>
 					<EF:EFColumn ename="docId" cname="文件ID" enable="false" width="180" hidden="true"/>
 					<EF:EFColumn ename="operator" cname="操作" enable="false" width="140" align="center"/>
 					<EF:EFColumn ename="docName" cname="文件名称" enable="false" width="180"/>
-					<EF:EFColumn ename="docType" cname="文件类型" enable="false" width="110"/>
+					<EF:EFColumn ename="docType" cname="文件类型" enable="false" width="110" align="center"/>
 					<EF:EFComboColumn ename="status" cname="状态" enable="false" width="100" align="center"
 					                  defaultValue="0" hidden="false">
 						<EF:EFCodeOption codeName="hggp.hgwd.status"/>
@@ -124,7 +124,7 @@
 							  align="center" filter="contains" sort="true">
 				<EF:EFOptions blockId="companyBox_block_id" textField="textField" valueField="valueField"/>
 			</EF:EFComboColumn>
-			<EF:EFColumn ename="companyName" cname="项目名称" width="160" enable="true" readonly="true" align="center"
+			<EF:EFColumn ename="companyName" cname="公司名称" width="160" enable="true" readonly="true" align="center"
 						 required="true" hidden="true"/>
 			<EF:EFComboColumn ename="projCode" cname="项目名称" blockName="proj_record_block_id"
 							  columnTemplate="#=textField#" itemTemplate="#=textField#"

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

@@ -24,8 +24,10 @@
                 <EF:EFOption label="全部" value=""/>
                 <EF:EFOptions blockId="companyBox_block_id" textField="textField" valueField="valueField"/>
             </EF:EFSelect>
-            <EF:EFInput blockId="inqu_status" row="0" ename="projCode" cname="项目编码" type="hidden" colWidth="3"/>
-            <EF:EFInput blockId="inqu_status" row="0" ename="projName" cname="项目名称" placeholder="模糊查询" colWidth="3" readonly="true"/>
+            <EF:EFSelect blockId="inqu_status" row="0" ename="projCode" cname="项目名称" colWidth="3" filter="contains" readonly="true">
+                <EF:EFOption label="全部" value=""/>
+                <EF:EFOptions blockId="proj_record_block_id" textField="textField" valueField="valueField"/>
+            </EF:EFSelect>
             <EF:EFSelect blockId="inqu_status" row="0" ename="changeType" cname="变更类型" colWidth="3" filter="contains">
                 <EF:EFOption label="全部" value=""/>
                 <EF:EFCodeOption codeName="hggp.hgwd.changeType"/>

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

@@ -182,7 +182,7 @@ let save = function (btnNode) {
                         var status = e.status;
                         if (status !== -1) {
                             let parentId = $("#inqu_status-0-parentId").val();
-                            parent.JSColorbox.setValueCallback(parentId);
+                            parent.JSColorbox.setValueCallback(e.getBlock("result").getMappedRows());
                         }
                     });
                 btnNode.attr("disabled", false);

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

@@ -47,20 +47,20 @@
                               align="center" filter="contains" sort="true">
                 <EF:EFOptions blockId="companyBox_block_id" textField="textField" valueField="valueField"/>
             </EF:EFComboColumn>
-            <EF:EFColumn ename="companyName" cname="所属项目" width="160" enable="true" readonly="true" align="center"
+            <EF:EFColumn ename="companyName" cname="公司名称" width="160" enable="true" readonly="true" align="center"
                          required="true" hidden="true"/>
             <EF:EFComboColumn ename="projCode" cname="所属项目" blockName="proj_record_block_id"
                               columnTemplate="#=textField#" itemTemplate="#=textField#"
                               textField="textField" valueField="valueField"
                               maxLength="16" readonly="true" width="200" required="true"
-                              align="center" filter="contains" sort="true"/>
+                              align="left" filter="contains" sort="true"/>
             <EF:EFColumn ename="projName" cname="所属项目" width="160" enable="true" readonly="true" align="center"
                          required="true" hidden="true"/>
             <EF:EFComboColumn ename="fileType" cname="文件类型" width="100" align="center" readonly="false" required="true"
                               defaultValue="20">
                 <EF:EFCodeOption codeName="hggp.hgwd.fileType"/>
             </EF:EFComboColumn>
-            <EF:EFColumn ename="fileName" cname="文件名称" width="160" enable="true" readonly="false" align="center"
+            <EF:EFColumn ename="fileName" cname="文件名称" width="160" enable="true" readonly="false" align="left"
                          required="true"/>
             <EF:EFColumn ename="fileId" cname="文件号" width="100" enable="false" readonly="true" align="center"
                          required="false"/>

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

@@ -52,14 +52,14 @@
                               columnTemplate="#=textField#" itemTemplate="#=textField#"
                               textField="textField" valueField="valueField"
                               maxLength="16" readonly="true" width="200" required="true"
-                              align="center" filter="contains" sort="true"/>
+                              align="left" filter="contains" sort="true"/>
             <EF:EFColumn ename="projName" cname="所属项目" width="160" enable="true" readonly="true" align="center"
                          required="true" hidden="true"/>
             <EF:EFComboColumn ename="fileType" cname="文件类型" width="100" align="center" readonly="false" required="true"
                               defaultValue="20">
                 <EF:EFCodeOption codeName="hggp.hgwd.fileType"/>
             </EF:EFComboColumn>
-            <EF:EFColumn ename="fileName" cname="文件名称" width="160" enable="true" readonly="false" align="center"
+            <EF:EFColumn ename="fileName" cname="文件名称" width="160" enable="true" readonly="false" align="left"
                          required="true"/>
             <EF:EFColumn ename="fileId" cname="文件号" width="100" enable="false" readonly="true" align="center"
                          required="false"/>

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

@@ -98,7 +98,7 @@ $(function () {
 				const eNameValue = _data.ename;
 				setTreeNodeValue(_data);
 				$("[name = 'inqu_status-0-parentId']").val(labelValue);
-				$("[name = 'inqu_status-0-fileId']").val(eNameValue);
+				$("[name = 'inqu_status-0-fileId']").val(_data.id);
 				$("[name = 'inqu_status-0-leafLevel']").val(_data.leafLevel==null?0:_data.leafLevel);
 				$("[name = 'inqu_status-0-projCode']").val(_data.projCode);
 				$("[name = 'inqu_status-0-companyCode']").val(_data.companyCode);

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

@@ -11,7 +11,7 @@
 			<EF:EFRegion title="文档目录树" id="tree" fitHeight="true">
 				<div id="menu" style="margin-top: 12px; margin-bottom: 8px">
 					<EF:EFTree bindId="docTree" ename="tree_name" textField="text" valueField="label"
-					           hasChildren="leaf" pid="parentId" serviceName="HGWD001D" methodName="query"
+					           hasChildren="leaf" pid="parentId" serviceName="HGWD001D" methodName="queryTree"
 					           expandLevel="1">
 					</EF:EFTree>
 				</div>

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

@@ -12,6 +12,7 @@ $(function () {
             columns: [
                 {
                     field: "changeStartCode",
+                    hidden: true,
                     template: function (item) {
                         let template = item["changeStartCode"]
                         if (item['changeType'] === "uploadAdd" || item['changeType'] === "uploadDelete") {

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

@@ -44,9 +44,9 @@
                 <EF:EFOptions blockId="companyBox_block_id" textField="textField" valueField="valueField"/>
             </EF:EFComboColumn>
             <EF:EFColumn ename="projName" cname="项目名称" width="160" enable="true" readonly="false" align="left" required="false"/>
-            <EF:EFColumn ename="changeContent" cname="文件名称" width="160" enable="true" readonly="true" align="center" required="false"/>
-            <EF:EFColumn ename="changeStartCode" cname="附件ID" width="160" enable="true" readonly="false" align="center" required="false"/>
-            <EF:EFColumn ename="changeStart" cname="附件名称" width="160" enable="true" readonly="true" align="center" required="false"/>
+            <EF:EFColumn ename="changeContent" cname="文件名称" width="160" enable="true" readonly="true" align="left" required="false"/>
+            <%--<EF:EFColumn ename="changeStartCode" cname="附件ID" width="160" enable="true" readonly="false" align="center" required="false"/>--%>
+            <EF:EFColumn ename="changeStart" cname="附件名称" width="160" enable="true" readonly="true" align="left" required="false"/>
             <EF:EFColumn ename="createdName" cname="删除人" align="center" width="100" readonly="true" required="false"
                          enable="false"/>
             <EF:EFColumn ename="createdTime" cname="删除时间" parseFormats="['yyyyMMddHHmmss']" editType="datetime"