From ba3b80f6ee619417ea0adb8ffa2a352fe548da26 Mon Sep 17 00:00:00 2001 From: wangzhijiang Date: Wed, 12 Apr 2023 10:26:34 +0800 Subject: [PATCH] =?UTF-8?q?UAT=E9=97=AE=E9=A2=98=E6=B8=85=E5=8D=95-4=20?= =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95=E8=AE=BE=E8=AE=A1=E3=80=81?= =?UTF-8?q?=E9=AA=8C=E8=AF=81=E7=AC=A6=E5=90=88=E6=80=A7=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=A1=A8=E5=A4=B4=E6=8E=92=E5=BA=8F=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProjectLawsInventoryEOServiceImpl.java | 112 ++++++++++++++++++ .../impl/ProcessInfoEOServiceImpl.java | 2 + 2 files changed, 114 insertions(+) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java index e4f085591..e31cb5c39 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java @@ -1527,6 +1527,114 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl{ + 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 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 verifyDutyId.equals(e.getId())). map(SysUser::getUsername).collect(Collectors.joining(",")); projectLawsInventoryEO.setVerifyDutyIdName(verifyDutyName); + }else { + projectLawsInventoryEO.setVerifyDutyIdName(""); } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/impl/ProcessInfoEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/impl/ProcessInfoEOServiceImpl.java index ce47517dd..528087f1c 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/impl/ProcessInfoEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/impl/ProcessInfoEOServiceImpl.java @@ -1435,6 +1435,7 @@ public class ProcessInfoEOServiceImpl extends ServiceImpl