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

68381 认证清单-认证工程师退回或studio撤回，飞书消息截止时间问题

Browse Source
This commit is contained in:
wangzhijiang
2023-04-17 22:38:04 +08:00
parent 80b3f0ee7a
commit b3556337e4
1 changed files with 6 additions and 2 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/ProjectCertificationInventoryEOServiceImpl.java
+6 -2
View File
@@ -2212,7 +2212,7 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
if(StringUtils.isNotEmpty(thirdId)){ if(StringUtils.isNotEmpty(thirdId)){
// 根据结束时间进行排序，获取最近的时间，发消息时使用。 // 根据结束时间进行排序，获取最近的时间，发消息时使用。
Collections.sort(projectCertificationInventoryEOList, new Comparator<ProjectCertificationInventoryEO>() { /*Collections.sort(projectCertificationInventoryEOList, new Comparator<ProjectCertificationInventoryEO>() {
@Override @Override
public int compare(ProjectCertificationInventoryEO p1, ProjectCertificationInventoryEO p2) { public int compare(ProjectCertificationInventoryEO p1, ProjectCertificationInventoryEO p2) {
if(p1.getEndTime() != null && p2.getEndTime() != null){ if(p1.getEndTime() != null && p2.getEndTime() != null){
@@ -2221,7 +2221,9 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
return 1; return 1;
} }
}); });
Date endTime = projectCertificationInventoryEOList.get(0).getEndTime(); Date endTime = projectCertificationInventoryEOList.get(0).getEndTime();*/
this.certificationInventoryEOListSortByInventoryVerifyEndTimeAsc(projectCertificationInventoryEOList);
Date endTime = projectCertificationInventoryEOList.get(0).getInventoryVerifyEndTime();
JSONObject larkMesJson = new JSONObject(); JSONObject larkMesJson = new JSONObject();
larkMesJson.put("template_id", TemplateInfoEnum2.CERTIFICATION_MESSAGE3.getValue()); larkMesJson.put("template_id", TemplateInfoEnum2.CERTIFICATION_MESSAGE3.getValue());
@@ -2561,6 +2563,8 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
JSONObject larkMesJson = new JSONObject(); JSONObject larkMesJson = new JSONObject();
if(StringUtils.equals(operatorType,OperatorTypeEnum.CERTIFICATION_INVENTORY_STUDIO_WITHDRAW.getValue())){ if(StringUtils.equals(operatorType,OperatorTypeEnum.CERTIFICATION_INVENTORY_STUDIO_WITHDRAW.getValue())){
this.certificationInventoryEOListSortByInventoryVerifyEndTimeAsc(projectCertificationInventoryEOList);
endTime = projectCertificationInventoryEOList.get(0).getInventoryVerifyEndTime();
larkMesJson.put("template_id", TemplateInfoEnum2.CERTIFICATION_MESSAGE4.getValue()); larkMesJson.put("template_id", TemplateInfoEnum2.CERTIFICATION_MESSAGE4.getValue());
}else if(StringUtils.equals(operatorType,OperatorTypeEnum.CERTIFICATION_INVENTORY_STUDIO_RESET.getValue())){ }else if(StringUtils.equals(operatorType,OperatorTypeEnum.CERTIFICATION_INVENTORY_STUDIO_RESET.getValue())){
larkMesJson.put("template_id", TemplateInfoEnum2.CERTIFICATION_MESSAGE5.getValue()); larkMesJson.put("template_id", TemplateInfoEnum2.CERTIFICATION_MESSAGE5.getValue());