diff --git a/com.actionsoft.apps.coe.pal.datamigration/lib/com.actionsoft.apps.coe.pal.datamigration.jar b/com.actionsoft.apps.coe.pal.datamigration/lib/com.actionsoft.apps.coe.pal.datamigration.jar index e0ae96a3..21f4a893 100644 Binary files a/com.actionsoft.apps.coe.pal.datamigration/lib/com.actionsoft.apps.coe.pal.datamigration.jar and b/com.actionsoft.apps.coe.pal.datamigration/lib/com.actionsoft.apps.coe.pal.datamigration.jar differ diff --git a/com.actionsoft.apps.coe.pal.datamigration/src/com/actionsoft/apps/coe/pal/datamigration/web/DataMigrationWeb.java b/com.actionsoft.apps.coe.pal.datamigration/src/com/actionsoft/apps/coe/pal/datamigration/web/DataMigrationWeb.java index 5f5b8930..9acf709b 100644 --- a/com.actionsoft.apps.coe.pal.datamigration/src/com/actionsoft/apps/coe/pal/datamigration/web/DataMigrationWeb.java +++ b/com.actionsoft.apps.coe.pal.datamigration/src/com/actionsoft/apps/coe/pal/datamigration/web/DataMigrationWeb.java @@ -455,12 +455,15 @@ public class DataMigrationWeb extends ActionWeb { return ResponseObject.newErrResponse("流程文件属性配置异常,没有获取到文件属性"); } for (PALRepositoryPropertyModel importProperty : importPropertyList) { - WordField wordField = fileFieldMap.get(importProperty.getPropertyName()); + + String title = this.getAttributeTitle(importModel.getWsId(), importModel.getMethodId(), importProperty.getPropertyId()); + + WordField wordField = fileFieldMap.get(title); //旧版本的映射字段支持 if (null == wordField && wordUtil.getIsOldVersion()) { Map oldWordMapping = wordUtil.getOldWordMapping(); for (String s : oldWordMapping.keySet()) { - if (s.equals(importProperty.getPropertyName())) { + if (s.equals(title)) { String s1 = oldWordMapping.get(s); wordField = fileFieldMap.get(s1); } @@ -666,6 +669,19 @@ public class DataMigrationWeb extends ActionWeb { return ResponseObject.newOkResponse("导入成功"); } + private String getAttributeTitle(String wsId,String methodId,String propertyId){ + String title = ""; + // 获取所有文件属性 + List methodAttrModels = PALRepositoryAPIManager.getInstance().getValidAttributeModels(wsId, methodId); + for (PALMethodAttributeModel r : methodAttrModels) { + if (r.getKey().equals(propertyId)){ + title = r.getNewTitle(); + break; + } + } + return title; + } + private DCContext getFileDcContext(String groupValue, String fileValue) { DCContext context = null;