WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

UAT问题清单-4 法规清单设计、验证符合性流程增加表头排序字段。

Browse Source
This commit is contained in:
wangzhijiang
2023-04-12 10:26:34 +08:00
parent 0c8b448b05
commit ba3b80f6ee
2 changed files with 114 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
+112
View File
@@ -1527,6 +1527,114 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
if("attestationRank".equals(orderByField)){
result = attestationRankSort(orderBy,orderByField,result,list);
}
// 设计符合性排序
// 设计符合性-责任人 designDutyId
if("designDutyId".equals(orderByField)){
if(OrderEnum.POSITIVE.getValue().equals(orderBy)){
Collections.sort(result,(e1, e2)->{
return comparator.compare(e1.getDesignDutyIdName(),e2.getDesignDutyIdName());
});
}else if(OrderEnum.REVERSE.getValue().equals(orderBy)){
Collections.sort(result,(e1,e2)->{
return comparator.compare(e2.getDesignDutyIdName(),e1.getDesignDutyIdName());
});
}
}
// 设计符合性-截止时间 designDueDate
if("designDueDate".equals(orderByField)){
if(OrderEnum.POSITIVE.getValue().equals(orderBy)){
Collections.sort(result,(e1, e2)->{
if(e1.getDesignDueDate() != null && e2.getDesignDueDate() != null){
String e1DesignDueDate = DateUtils.formatDate(e1.getDesignDueDate());
String e2DesignDueDate = DateUtils.formatDate(e2.getDesignDueDate());
return comparator.compare(e1DesignDueDate,e2DesignDueDate);
}
return -1;
});
}else if(OrderEnum.REVERSE.getValue().equals(orderBy)){
Collections.sort(result,(e1,e2)->{
if(e1.getDesignDueDate() != null && e2.getDesignDueDate() != null){
String e1DesignDueDate = DateUtils.formatDate(e1.getDesignDueDate());
String e2DesignDueDate = DateUtils.formatDate(e2.getDesignDueDate());
return comparator.compare(e2DesignDueDate,e1DesignDueDate);
}
return -1;
});
}
}
// 设计符合性-交付物类型 designDeliverableType
if("designDeliverableType".equals(orderByField)){
if(OrderEnum.POSITIVE.getValue().equals(orderBy)){
Collections.sort(result,(e1, e2)->{
if(e1.getDesignDeliverableTypeName() != null && e2.getDesignDeliverableTypeName() != null){
return comparator.compare(e1.getDesignDeliverableTypeName(),e2.getDesignDeliverableTypeName());
}
return -1;
});
}else if(OrderEnum.REVERSE.getValue().equals(orderBy)){
Collections.sort(result,(e1,e2)->{
if(e1.getDesignDeliverableTypeName() != null && e2.getDesignDeliverableTypeName() != null){
return comparator.compare(e2.getDesignDeliverableTypeName(),e1.getDesignDeliverableTypeName());
}
return -1;
});
}
}
// 验证符合性排序
// 验证符合性-责任人 verifyDutyId
if("verifyDutyId".equals(orderByField)){
if(OrderEnum.POSITIVE.getValue().equals(orderBy)){
Collections.sort(result,(e1, e2)->{
return comparator.compare(e1.getVerifyDutyIdName(),e2.getVerifyDutyIdName());
});
}else if(OrderEnum.REVERSE.getValue().equals(orderBy)){
Collections.sort(result,(e1,e2)->{
return comparator.compare(e2.getVerifyDutyIdName(),e1.getVerifyDutyIdName());
});
}
}
// 验证符合性-截止时间 verifyDueDate
if("verifyDueDate".equals(orderByField)){
if(OrderEnum.POSITIVE.getValue().equals(orderBy)){
Collections.sort(result,(e1, e2)->{
if(e1.getVerifyDueDate() != null && e2.getVerifyDueDate() != null){
String e1VerifyDueDate = DateUtils.formatDate(e1.getVerifyDueDate());
String e2VerifyDueDate = DateUtils.formatDate(e2.getVerifyDueDate());
return comparator.compare(e1VerifyDueDate,e2VerifyDueDate);
}
return -1;
});
}else if(OrderEnum.REVERSE.getValue().equals(orderBy)){
Collections.sort(result,(e1,e2)->{
if(e1.getVerifyDueDate() != null && e2.getVerifyDueDate() != null){
String e1VerifyDueDate = DateUtils.formatDate(e1.getVerifyDueDate());
String e2VerifyDueDate = DateUtils.formatDate(e2.getVerifyDueDate());
return comparator.compare(e2VerifyDueDate,e1VerifyDueDate);
}
return -1;
});
}
}
// 验证符合性-交付物类型 verifyDeliverableType
if("verifyDeliverableType".equals(orderByField)){
if(OrderEnum.POSITIVE.getValue().equals(orderBy)){
Collections.sort(result,(e1, e2)->{
if(e1.getVerifyDeliverableTypeName() != null && e2.getVerifyDeliverableTypeName() != null){
return comparator.compare(e1.getVerifyDeliverableTypeName(),e2.getVerifyDeliverableTypeName());
}
return -1;
});
}else if(OrderEnum.REVERSE.getValue().equals(orderBy)){
Collections.sort(result,(e1,e2)->{
if(e1.getVerifyDeliverableTypeName() != null && e2.getVerifyDeliverableTypeName() != null){
return comparator.compare(e2.getVerifyDeliverableTypeName(),e1.getVerifyDeliverableTypeName());
}
return -1;
});
}
}
}
return result;
}
@@ -2039,6 +2147,8 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
String designDutyName = sysUsers.stream().filter(e -> designDutyId.equals(e.getId())).
map(SysUser::getUsername).collect(Collectors.joining(","));
projectLawsInventoryEO.setDesignDutyIdName(designDutyName);
}else {
projectLawsInventoryEO.setDesignDutyIdName("");
}
//prehomo确认
@@ -2071,6 +2181,8 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
String verifyDutyName = sysUsers.stream().filter(e -> verifyDutyId.equals(e.getId())).
map(SysUser::getUsername).collect(Collectors.joining(","));
projectLawsInventoryEO.setVerifyDutyIdName(verifyDutyName);
}else {
projectLawsInventoryEO.setVerifyDutyIdName("");
}
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/impl/ProcessInfoEOServiceImpl.java
+2
View File
@@ -1435,6 +1435,7 @@ public class ProcessInfoEOServiceImpl extends ServiceImpl<ProcessInfoEOMapper, P
addProcessHistoryEO.setActiProcInstId(designPId);
addProcessHistoryEO.setTaskDefinitionKey(DesignComplianceFlowNodeKeyEnum.ZRRQR.getValue());
addProcessHistoryEO.setProjectLawsInventoryId(projectLawsInventoryId);
addProcessHistoryEO.setOperatorResult(ReviewResultEnum.ACCEPTED.getValue());
// 获取当前法规清单数据 在走任务确认流程的时候信息。
addProcessHistoryEO.setAssignee(processInfoDetailEO.getUserId());
@@ -1658,6 +1659,7 @@ public class ProcessInfoEOServiceImpl extends ServiceImpl<ProcessInfoEOMapper, P
addProcessHistoryEO.setActiProcInstId(verifyPId);
addProcessHistoryEO.setTaskDefinitionKey(VerifyComplianceFlowNodeKeyEnum.ZRRQR.getValue());
addProcessHistoryEO.setProjectLawsInventoryId(projectLawsInventoryId);
addProcessHistoryEO.setOperatorResult(ReviewResultEnum.ACCEPTED.getValue());
// 获取当前法规清单数据 在走任务确认流程的时候信息。
addProcessHistoryEO.setAssignee(processInfoDetailEO.getUserId());