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

关联属性增加所有排序

Browse Source
This commit is contained in:
zhal 2022-11-02 21:16:04 +08:00
parent 994db05838
commit 9b483442c7
10 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

Binary file not shown.

8
com.actionsoft.apps.coe.pal.batch/src/com/actionsoft/apps/coe/pal/batch/job/batchUpdateSort.java
View File

@ -40,14 +40,14 @@ public class batchUpdateSort implements IJob {
int update = DBSql.update(open, str1); int update = DBSql.update(open, str1);
if (update > 0) { 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++; b++;
} else { } 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) { } catch (Exception e) {
e.printStackTrace(); 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 + "]条"); SDK.getLogAPI().consoleInfo("[完成]刷新绩效图图EXT2字段内容，总共更新[" + b + "]条");
if (b > 0) { if (b > 0) {

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

Binary file not shown.

3
com.actionsoft.apps.coe.pal.output.pr/src/com/actionsoft/apps/coe/pal/output/pr/report1/Report1Gener.java
View File

@ -516,6 +516,9 @@ public class Report1Gener {
//相关文件 R_relevant_flies //相关文件 R_relevant_flies
JSONArray relevant_flies = new JSONArray(); //组织职责Table JSONArray relevant_flies = new JSONArray(); //组织职责Table
List<DesignerShapeRelationModel> relationList2 = DesignerShapeRelationCache.getListByAttrId(repositoryModel.getId(), "", "R_relevant_flies"); List<DesignerShapeRelationModel> relationList2 = DesignerShapeRelationCache.getListByAttrId(repositoryModel.getId(), "", "R_relevant_flies");
relationList2.sort(Comparator.comparing(DesignerShapeRelationModel::getRelationShapeText));
int count = 0; int count = 0;
for (DesignerShapeRelationModel relation : relationList2) { for (DesignerShapeRelationModel relation : relationList2) {
String relationFileId = relation.getRelationFileId();// 支持或相关文件的ID String relationFileId = relation.getRelationFileId();// 支持或相关文件的ID

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

Binary file not shown.

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

@ -5423,9 +5423,7 @@ public class PALRepositoryQueryAPIManager {
if ("relation".equals(attributeModel.getType())) { if ("relation".equals(attributeModel.getType())) {
List<String> inputValueList = new ArrayList<>(); List<String> inputValueList = new ArrayList<>();
List<DesignerShapeRelationModel> list = DesignerShapeRelationCache.getListByAttrId(plModel.getId(), "", attributeModel.getKey()); List<DesignerShapeRelationModel> 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) { if (list != null && list.size() > 0) {
// 判断是否有重复数据，进行重复过滤 // 判断是否有重复数据，进行重复过滤
Set<String> tempStrs = new HashSet<>(); Set<String> tempStrs = new HashSet<>();

4
com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/designer/relation/web/DesignerRelationShapeWeb.java
View File

@ -966,9 +966,7 @@ public class DesignerRelationShapeWeb extends ActionWeb {
} }
String tmpStr = StringUtils.join(versionIds, ","); String tmpStr = StringUtils.join(versionIds, ",");
List<DesignerShapeRelationModel> list = dao.getModelListByShapeIdAndRelationShapeId(ruuid, shapeId, null, tmpStr); List<DesignerShapeRelationModel> 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) { for (DesignerShapeRelationModel model : list) {
if (ids.contains(model.getRelationFileId())) { if (ids.contains(model.getRelationFileId())) {
continue; continue;

5
com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/web/CoeProcessLevelWeb.java
View File

@ -2534,10 +2534,7 @@ public class CoeProcessLevelWeb extends ActionWeb {
if ("relation".equals(attributeModel.getType())) { if ("relation".equals(attributeModel.getType())) {
List<DesignerShapeRelationModel> list = DesignerShapeRelationCache.getListByAttrId(uuid, "", attributeModel.getKey()); List<DesignerShapeRelationModel> list = DesignerShapeRelationCache.getListByAttrId(uuid, "", attributeModel.getKey());
//如果类型为支持文件根据时间戳排序 list.sort(Comparator.comparing(DesignerShapeRelationModel::getRelationShapeText));
if(attributeModel.getKey().equals("support_files")){
list.sort(Comparator.comparing(DesignerShapeRelationModel::getRelationShapeText));
}
if (list != null && list.size() > 0) { if (list != null && list.size() > 0) {
// 判断是否有重复数据，进行重复过滤 // 判断是否有重复数据，进行重复过滤

BIN
com.awspaas.user.apps.coe.pal.output.zd/lib/com.awspaas.user.apps.coe.pal.output.zd.jar
View File

Binary file not shown.

4
com.awspaas.user.apps.coe.pal.output.zd/src/com/awspaas/apps/coe/pal/output/zd/report1/Report1Gener.java
View File

@ -714,6 +714,10 @@ public class Report1Gener {
//相关文件 related_files //相关文件 related_files
JSONArray related_files = new JSONArray(); //组织职责Table JSONArray related_files = new JSONArray(); //组织职责Table
List<DesignerShapeRelationModel> relationList2 = DesignerShapeRelationCache.getListByAttrId(repositoryModel.getId(), "", "related_files"); List<DesignerShapeRelationModel> relationList2 = DesignerShapeRelationCache.getListByAttrId(repositoryModel.getId(), "", "related_files");
relationList2.sort(Comparator.comparing(DesignerShapeRelationModel::getRelationShapeText));
int count = 0; int count = 0;
for (DesignerShapeRelationModel relation : relationList2) { for (DesignerShapeRelationModel relation : relationList2) {
String relationFileId = relation.getRelationFileId();// 支持或相关文件的ID String relationFileId = relation.getRelationFileId();// 支持或相关文件的ID