diff --git a/com.actionsoft.apps.coe.pal.batch/lib/com.actionsoft.apps.coe.pal.batch.jar b/com.actionsoft.apps.coe.pal.batch/lib/com.actionsoft.apps.coe.pal.batch.jar index 95b1b1e1..4c9f910b 100644 Binary files a/com.actionsoft.apps.coe.pal.batch/lib/com.actionsoft.apps.coe.pal.batch.jar and b/com.actionsoft.apps.coe.pal.batch/lib/com.actionsoft.apps.coe.pal.batch.jar differ diff --git a/com.actionsoft.apps.coe.pal.batch/src/com/actionsoft/apps/coe/pal/batch/job/batchUpdateSort.java b/com.actionsoft.apps.coe.pal.batch/src/com/actionsoft/apps/coe/pal/batch/job/batchUpdateSort.java index 45d3066a..22154614 100644 --- a/com.actionsoft.apps.coe.pal.batch/src/com/actionsoft/apps/coe/pal/batch/job/batchUpdateSort.java +++ b/com.actionsoft.apps.coe.pal.batch/src/com/actionsoft/apps/coe/pal/batch/job/batchUpdateSort.java @@ -40,14 +40,14 @@ public class batchUpdateSort implements IJob { int update = DBSql.update(open, str1); if (update > 0) { - SDK.getLogAPI().consoleInfo("[成功]刷新绩效图EXT2字段内容,绩效图[" + rowMap1.getString("PLNAME") + "][" + rowMap1.getString("ID") + "],改为[" + processList.toString() + "]"); + SDK.getLogAPI().consoleInfo("[成功]刷新末级流程绩效图EXT2字段内容,绩效图[" + rowMap1.getString("PLNAME") + "][" + rowMap1.getString("ID") + "],改为[" + processList.toString() + "]"); b++; } else { - SDK.getLogAPI().consoleErr("[失败]刷新绩效图EXT2字段内容,绩效图[" + rowMap1.getString("PLNAME") + "][" + rowMap1.getString("ID") + "],改为[" + processList.toString() + "]"); + SDK.getLogAPI().consoleErr("[失败]刷新末级流程绩效图EXT2字段内容,绩效图[" + rowMap1.getString("PLNAME") + "][" + rowMap1.getString("ID") + "],改为[" + processList.toString() + "]"); } } catch (Exception e) { e.printStackTrace(); - SDK.getLogAPI().consoleErr("[失败]刷新绩效图EXT2字段内容,绩效图[" + rowMap1.getString("PLNAME") + "][" +rowMap1.getString("ID") + "],改为[" + processList.toString() + "],错误信息:" + e.getMessage()); + SDK.getLogAPI().consoleErr("[失败]刷新末级流程绩效图EXT2字段内容,绩效图[" + rowMap1.getString("PLNAME") + "][" +rowMap1.getString("ID") + "],改为[" + processList.toString() + "],错误信息:" + e.getMessage()); } @@ -56,6 +56,8 @@ public class batchUpdateSort implements IJob { } + + } SDK.getLogAPI().consoleInfo("[完成]刷新绩效图图EXT2字段内容,总共更新[" + b + "]条"); if (b > 0) { diff --git a/com.actionsoft.apps.coe.pal.output.pr/lib/com.actionsoft.apps.coe.pal.output.pr.jar b/com.actionsoft.apps.coe.pal.output.pr/lib/com.actionsoft.apps.coe.pal.output.pr.jar index fee76637..47a7a266 100644 Binary files a/com.actionsoft.apps.coe.pal.output.pr/lib/com.actionsoft.apps.coe.pal.output.pr.jar and b/com.actionsoft.apps.coe.pal.output.pr/lib/com.actionsoft.apps.coe.pal.output.pr.jar differ diff --git a/com.actionsoft.apps.coe.pal.output.pr/src/com/actionsoft/apps/coe/pal/output/pr/report1/Report1Gener.java b/com.actionsoft.apps.coe.pal.output.pr/src/com/actionsoft/apps/coe/pal/output/pr/report1/Report1Gener.java index 0958310f..2ece9a66 100644 --- a/com.actionsoft.apps.coe.pal.output.pr/src/com/actionsoft/apps/coe/pal/output/pr/report1/Report1Gener.java +++ b/com.actionsoft.apps.coe.pal.output.pr/src/com/actionsoft/apps/coe/pal/output/pr/report1/Report1Gener.java @@ -516,6 +516,9 @@ public class Report1Gener { //相关文件 R_relevant_flies JSONArray relevant_flies = new JSONArray(); //组织职责Table List relationList2 = DesignerShapeRelationCache.getListByAttrId(repositoryModel.getId(), "", "R_relevant_flies"); + + relationList2.sort(Comparator.comparing(DesignerShapeRelationModel::getRelationShapeText)); + int count = 0; for (DesignerShapeRelationModel relation : relationList2) { String relationFileId = relation.getRelationFileId();// 支持或相关文件的ID diff --git a/com.actionsoft.apps.coe.pal/lib/com.actionsoft.apps.coe.pal.jar b/com.actionsoft.apps.coe.pal/lib/com.actionsoft.apps.coe.pal.jar index 2702d9e6..ec923dc7 100644 Binary files a/com.actionsoft.apps.coe.pal/lib/com.actionsoft.apps.coe.pal.jar and b/com.actionsoft.apps.coe.pal/lib/com.actionsoft.apps.coe.pal.jar differ diff --git a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/PALRepositoryQueryAPIManager.java b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/PALRepositoryQueryAPIManager.java index 0ba88895..886a3159 100755 --- a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/PALRepositoryQueryAPIManager.java +++ b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/PALRepositoryQueryAPIManager.java @@ -5423,9 +5423,7 @@ public class PALRepositoryQueryAPIManager { if ("relation".equals(attributeModel.getType())) { List inputValueList = new ArrayList<>(); List list = DesignerShapeRelationCache.getListByAttrId(plModel.getId(), "", attributeModel.getKey()); - if(attributeModel.getKey().equals("support_files")){ - list.sort(Comparator.comparing(DesignerShapeRelationModel::getRelationShapeText)); - } + list.sort(Comparator.comparing(DesignerShapeRelationModel::getRelationShapeText)); if (list != null && list.size() > 0) { // 判断是否有重复数据,进行重复过滤 Set tempStrs = new HashSet<>(); diff --git a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/designer/relation/web/DesignerRelationShapeWeb.java b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/designer/relation/web/DesignerRelationShapeWeb.java index 37a4398a..eae9028e 100755 --- a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/designer/relation/web/DesignerRelationShapeWeb.java +++ b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/designer/relation/web/DesignerRelationShapeWeb.java @@ -966,9 +966,7 @@ public class DesignerRelationShapeWeb extends ActionWeb { } String tmpStr = StringUtils.join(versionIds, ","); List list = dao.getModelListByShapeIdAndRelationShapeId(ruuid, shapeId, null, tmpStr); - if(attrId.equals("support_files")){ - list.sort(Comparator.comparing(DesignerShapeRelationModel::getRelationShapeText)); - } + list.sort(Comparator.comparing(DesignerShapeRelationModel::getRelationShapeText)); for (DesignerShapeRelationModel model : list) { if (ids.contains(model.getRelationFileId())) { continue; diff --git a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/web/CoeProcessLevelWeb.java b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/web/CoeProcessLevelWeb.java index 85e4d80d..50f3c80d 100755 --- a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/web/CoeProcessLevelWeb.java +++ b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/web/CoeProcessLevelWeb.java @@ -2534,10 +2534,7 @@ public class CoeProcessLevelWeb extends ActionWeb { if ("relation".equals(attributeModel.getType())) { List list = DesignerShapeRelationCache.getListByAttrId(uuid, "", attributeModel.getKey()); - //如果类型为支持文件根据时间戳排序 - if(attributeModel.getKey().equals("support_files")){ - list.sort(Comparator.comparing(DesignerShapeRelationModel::getRelationShapeText)); - } + list.sort(Comparator.comparing(DesignerShapeRelationModel::getRelationShapeText)); if (list != null && list.size() > 0) { // 判断是否有重复数据,进行重复过滤 diff --git a/com.awspaas.user.apps.coe.pal.output.zd/lib/com.awspaas.user.apps.coe.pal.output.zd.jar b/com.awspaas.user.apps.coe.pal.output.zd/lib/com.awspaas.user.apps.coe.pal.output.zd.jar index 7a59ae71..6899ee9e 100644 Binary files a/com.awspaas.user.apps.coe.pal.output.zd/lib/com.awspaas.user.apps.coe.pal.output.zd.jar and b/com.awspaas.user.apps.coe.pal.output.zd/lib/com.awspaas.user.apps.coe.pal.output.zd.jar differ diff --git a/com.awspaas.user.apps.coe.pal.output.zd/src/com/awspaas/apps/coe/pal/output/zd/report1/Report1Gener.java b/com.awspaas.user.apps.coe.pal.output.zd/src/com/awspaas/apps/coe/pal/output/zd/report1/Report1Gener.java index 5735a422..58c3c015 100644 --- a/com.awspaas.user.apps.coe.pal.output.zd/src/com/awspaas/apps/coe/pal/output/zd/report1/Report1Gener.java +++ b/com.awspaas.user.apps.coe.pal.output.zd/src/com/awspaas/apps/coe/pal/output/zd/report1/Report1Gener.java @@ -714,6 +714,10 @@ public class Report1Gener { //相关文件 related_files JSONArray related_files = new JSONArray(); //组织职责Table List relationList2 = DesignerShapeRelationCache.getListByAttrId(repositoryModel.getId(), "", "related_files"); + + + relationList2.sort(Comparator.comparing(DesignerShapeRelationModel::getRelationShapeText)); + int count = 0; for (DesignerShapeRelationModel relation : relationList2) { String relationFileId = relation.getRelationFileId();// 支持或相关文件的ID