yili/apps
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

5581 流程图生成时岗位显示有问题，关联类型新增了同时关联模型和形状类型导致，

Browse Source 
已调整手册获取数据、图片生成锚点更新数据、通用获取文件及形状属性接口三个地方
This commit is contained in:
446052889@qq.com 2022-09-21 16:20:39 +08:00
parent f3c5c72c57
commit 5c78ee865c
5 changed files with 76 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
com.actionsoft.apps.coe.pal/lib/com.actionsoft.apps.coe.pal.jar
View File

Binary file not shown.

44
com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/PALRepositoryQueryAPIManager.java
View File

@ -5217,7 +5217,28 @@ public class PALRepositoryQueryAPIManager {
break; break;
} }
} }
} else { } else if ("shapeAndFile".equals(relationTyp)) {// 关联的模型形状和文件都有 伊利
if (UtilString.isEmpty(model.getRelationShapeId())) {// 关联文件，发现记录的不是versionID，而是id 伊利
PALRepositoryModel relationModel = PALRepositoryCache.getCache().get(model.getRelationFileId());
if (relationModel != null) {
inputValueList.add(relationModel.getName());
JSONObject tmp = new JSONObject();
tmp.put("fileId", relationModel.getId());
tmp.put("name", relationModel.getName());
tmp.put("isFile", true);
attrObj.getJSONArray("value").add(tmp);
}
} else {
// 关联形状
inputValueList.add(model.getRelationShapeText());
JSONObject tmp = new JSONObject();
tmp.put("fileId", model.getRelationFileId());
tmp.put("shapeId", model.getRelationShapeId());
tmp.put("name", model.getRelationShapeText());
tmp.put("isFile", false);
attrObj.getJSONArray("value").add(tmp);
}
} else {// 关联的模型形状
inputValueList.add(model.getRelationShapeText()); inputValueList.add(model.getRelationShapeText());
JSONObject tmp = new JSONObject(); JSONObject tmp = new JSONObject();
tmp.put("fileId", model.getRelationFileId()); tmp.put("fileId", model.getRelationFileId());
@ -5410,6 +5431,27 @@ public class PALRepositoryQueryAPIManager {
} }
} }
} }
} else if ("shapeAndFile".equals(relationType)) {// 关联的模型形状和文件都有 伊利
if (UtilString.isEmpty(relationModel.getRelationShapeId())) {// 关联文件，发现记录的不是versionID，而是id 伊利
PALRepositoryModel plModel = PALRepositoryCache.getCache().get(relationModel.getRelationFileId());
if (plModel != null) {
inputValues.add(plModel.getName());
JSONObject tmp = new JSONObject();
tmp.put("fileId", plModel.getId());
tmp.put("name", plModel.getName());
tmp.put("isFile", true);
attrObj.getJSONArray("value").add(tmp);
}
} else {
// 关联形状
inputValues.add(relationModel.getRelationShapeText());
JSONObject tmp = new JSONObject();
tmp.put("fileId", relationModel.getRelationFileId());
tmp.put("shapeId", relationModel.getRelationShapeId());
tmp.put("name", relationModel.getRelationShapeText());
tmp.put("isFile", false);
attrObj.getJSONArray("value").add(tmp);
}
} else {// 形状属性 } else {// 形状属性
inputValues.add(relationModel.getRelationShapeText()); inputValues.add(relationModel.getRelationShapeText());
JSONObject tmp = new JSONObject(); JSONObject tmp = new JSONObject();

12
com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/designer/CoeDesignerShapeAPIManager.java
View File

@ -1066,6 +1066,18 @@ public class CoeDesignerShapeAPIManager {
for (DesignerShapeRelationModel model : relationModels) { for (DesignerShapeRelationModel model : relationModels) {
textList.add(model.getRelationShapeText()); textList.add(model.getRelationShapeText());
} }
} else if("shapeAndFile".equals(relationType)) {// 关联形状和文件
for (DesignerShapeRelationModel model : relationModels) {
if (UtilString.isEmpty(model.getRelationShapeId())) {// 关联文件，发现记录的不是versionID，而是id 伊利
PALRepositoryModel relationModel = PALRepositoryCache.getCache().get(model.getRelationFileId());
if (relationModel != null) {
textList.add(relationModel.getName());
}
} else {
// 关联形状
textList.add(model.getRelationShapeText());
}
}
} else {// 关联文件 } else {// 关联文件
for (DesignerShapeRelationModel model : relationModels) { for (DesignerShapeRelationModel model : relationModels) {
String versionId = model.getRelationFileId(); String versionId = model.getRelationFileId();

10
com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/designer/util/ShapeUtil.java
View File

@ -201,6 +201,16 @@ public class ShapeUtil {
} }
} }
} }
} else if ("shapeAndFile".equals(relationType)) {// 关联的模型形状和文件都有 伊利
if (UtilString.isEmpty(relationModel.getRelationShapeId())) {// 关联文件，发现记录的不是versionID，而是id 伊利
PALRepositoryModel plModel = PALRepositoryCache.getCache().get(relationModel.getRelationFileId());
if (plModel != null) {
inputValues.add(plModel.getName());
}
} else {
// 关联形状
inputValues.add(relationModel.getRelationShapeText());
}
} else {// 形状属性 } else {// 形状属性
inputValues.add(relationModel.getRelationShapeText()); inputValues.add(relationModel.getRelationShapeText());
} }

12
com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/util/CoeProcessLevelUtil.java
View File

@ -2200,7 +2200,17 @@ public class CoeProcessLevelUtil {
break; break;
} }
} }
} else { } else if ("shapeAndFile".equals(relationTyp)) {// 关联的有形状属性和文件属性 伊利
if (UtilString.isEmpty(model.getRelationShapeId())) {// 关联文件，发现记录的不是versionID，而是id 伊利
PALRepositoryModel relationModel = PALRepositoryCache.getCache().get(model.getRelationFileId());
if (relationModel != null) {
inputValueList.add(relationModel.getName());
}
} else {
// 关联形状
inputValueList.add(model.getRelationShapeText());
}
} else {// 关联的形状属性
inputValueList.add(model.getRelationShapeText()); inputValueList.add(model.getRelationShapeText());
} }
} }