diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java index 00fd8b1d1..487725f35 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java @@ -550,6 +550,316 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl{ + String e1Title = StringUtils.isNotEmpty(e1.getTitle()) ? e1.getTitle() : ""; + String e2Title = StringUtils.isNotEmpty(e2.getTitle()) ? e2.getTitle() : ""; + return comparator.compare(e1Title,e2Title); + }); + }else if(OrderEnum.REVERSE.getValue().equals(orderBy)){ + Collections.sort(dummyInventoryInfoEOList,(e1,e2)->{ + String e1Title = StringUtils.isNotEmpty(e1.getTitle()) ? e1.getTitle() : ""; + String e2Title = StringUtils.isNotEmpty(e2.getTitle()) ? e2.getTitle() : ""; + return comparator.compare(e2Title,e1Title); + }); + } + } + // 子标题 subtitle + if("subtitle".equals(orderByField)){ + if(OrderEnum.POSITIVE.getValue().equals(orderBy)){ + Collections.sort(dummyInventoryInfoEOList,(e1, e2)->{ + String e1Subtitle = StringUtils.isNotEmpty(e1.getSubtitle()) ? e1.getSubtitle() : ""; + String e2Subtitle = StringUtils.isNotEmpty(e2.getSubtitle()) ? e2.getSubtitle() : ""; + return comparator.compare(e1Subtitle,e2Subtitle); + }); + }else if(OrderEnum.REVERSE.getValue().equals(orderBy)){ + Collections.sort(dummyInventoryInfoEOList,(e1,e2)->{ + String e1Subtitle = StringUtils.isNotEmpty(e1.getSubtitle()) ? e1.getSubtitle() : ""; + String e2Subtitle = StringUtils.isNotEmpty(e2.getSubtitle()) ? e2.getSubtitle() : ""; + return comparator.compare(e2Subtitle,e1Subtitle); + }); + } + } + // 适用地区 region_dictText + if("region_dictText".equals(orderByField)){ + if(OrderEnum.POSITIVE.getValue().equals(orderBy)){ + Collections.sort(dummyInventoryInfoEOList,(e1, e2)->{ + String e1Region = StringUtils.isNotEmpty(e1.getRegion()) ? e1.getRegion() : ""; + String e2Region = StringUtils.isNotEmpty(e2.getRegion()) ? e2.getRegion() : ""; + return comparator.compare(e1Region,e2Region); + }); + }else if(OrderEnum.REVERSE.getValue().equals(orderBy)){ + Collections.sort(dummyInventoryInfoEOList,(e1,e2)->{ + String e1Region = StringUtils.isNotEmpty(e1.getRegion()) ? e1.getRegion() : ""; + String e2Region = StringUtils.isNotEmpty(e2.getRegion()) ? e2.getRegion() : ""; + return comparator.compare(e2Region,e1Region); + }); + } + } + // 对应标准 correspondingStandard + if("correspondingStandard".equals(orderByField)){ + if(OrderEnum.POSITIVE.getValue().equals(orderBy)){ + Collections.sort(dummyInventoryInfoEOList,(e1, e2)->{ + String e1correspondingStandard = StringUtils.isNotEmpty(e1.getCorrespondingStandard()) ? e1.getCorrespondingStandard() : ""; + String e2correspondingStandard = StringUtils.isNotEmpty(e2.getCorrespondingStandard()) ? e2.getCorrespondingStandard() : ""; + return comparator.compare(e1correspondingStandard,e2correspondingStandard); + }); + }else if(OrderEnum.REVERSE.getValue().equals(orderBy)){ + Collections.sort(dummyInventoryInfoEOList,(e1,e2)->{ + String e1correspondingStandard = StringUtils.isNotEmpty(e1.getCorrespondingStandard()) ? e1.getCorrespondingStandard() : ""; + String e2correspondingStandard = StringUtils.isNotEmpty(e2.getCorrespondingStandard()) ? e2.getCorrespondingStandard() : ""; + return comparator.compare(e2correspondingStandard,e1correspondingStandard); + }); + } + } + // 实施类别 implementType_dictText + if("implementType_dictText".equals(orderByField)){ + if(OrderEnum.POSITIVE.getValue().equals(orderBy)){ + Collections.sort(dummyInventoryInfoEOList,(e1, e2)->{ + String e1ImplementType_dictText = StringUtils.isNotEmpty(e1.getImplementType_dictText()) ? e1.getImplementType_dictText() : ""; + String e2ImplementType_dictText = StringUtils.isNotEmpty(e2.getImplementType_dictText()) ? e2.getImplementType_dictText() : ""; + return comparator.compare(e1ImplementType_dictText,e2ImplementType_dictText); + }); + }else if(OrderEnum.REVERSE.getValue().equals(orderBy)){ + Collections.sort(dummyInventoryInfoEOList,(e1,e2)->{ + String e1ImplementType_dictText = StringUtils.isNotEmpty(e1.getImplementType_dictText()) ? e1.getImplementType_dictText() : ""; + String e2ImplementType_dictText = StringUtils.isNotEmpty(e2.getImplementType_dictText()) ? e2.getImplementType_dictText() : ""; + return comparator.compare(e2ImplementType_dictText,e1ImplementType_dictText); + }); + } + } + // 新车实施日期 xin1Che1Xing2Shi2Shi1Ri4Qi1String + if("xin1Che1Xing2Shi2Shi1Ri4Qi1String".equals(orderByField)){ + if(OrderEnum.POSITIVE.getValue().equals(orderBy)){ + Collections.sort(dummyInventoryInfoEOList,(e1, e2)->{ + if(e1.getXin1Che1Xing2Shi2Shi1Ri4Qi1() != null && e2.getXin1Che1Xing2Shi2Shi1Ri4Qi1() != null){ + String e1xin1Che1Xing2Shi2Shi1Ri4Qi = DateUtils.formatDate(e1.getXin1Che1Xing2Shi2Shi1Ri4Qi1()); + String e2xin1Che1Xing2Shi2Shi1Ri4Qi = DateUtils.formatDate(e2.getXin1Che1Xing2Shi2Shi1Ri4Qi1()); + return comparator.compare(e1xin1Che1Xing2Shi2Shi1Ri4Qi,e2xin1Che1Xing2Shi2Shi1Ri4Qi); + } + return 0; + }); + }else if(OrderEnum.REVERSE.getValue().equals(orderBy)){ + Collections.sort(dummyInventoryInfoEOList,(e1,e2)->{ + if(e1.getXin1Che1Xing2Shi2Shi1Ri4Qi1() != null && e2.getXin1Che1Xing2Shi2Shi1Ri4Qi1() != null){ + String e1xin1Che1Xing2Shi2Shi1Ri4Qi = DateUtils.formatDate(e1.getXin1Che1Xing2Shi2Shi1Ri4Qi1()); + String e2xin1Che1Xing2Shi2Shi1Ri4Qi = DateUtils.formatDate(e2.getXin1Che1Xing2Shi2Shi1Ri4Qi1()); + return comparator.compare(e2xin1Che1Xing2Shi2Shi1Ri4Qi,e1xin1Che1Xing2Shi2Shi1Ri4Qi); + } + return 0; + }); + } + } + // 在产车实施日期 implementTimeString + if("implementTimeString".equals(orderByField)){ + if(OrderEnum.POSITIVE.getValue().equals(orderBy)){ + Collections.sort(dummyInventoryInfoEOList,(e1, e2)->{ + if(e1.getImplementTime() != null && e2.getImplementTime() != null){ + String e1ImplementTime = DateUtils.formatDate(e1.getImplementTime()); + String e2ImplementTime = DateUtils.formatDate(e2.getImplementTime()); + return comparator.compare(e1ImplementTime,e2ImplementTime); + } + return 0; + }); + }else if(OrderEnum.REVERSE.getValue().equals(orderBy)){ + Collections.sort(dummyInventoryInfoEOList,(e1,e2)->{ + if(e1.getImplementTime() != null && e2.getImplementTime() != null){ + String e1ImplementTime = DateUtils.formatDate(e1.getImplementTime()); + String e2ImplementTime = DateUtils.formatDate(e2.getImplementTime()); + return comparator.compare(e2ImplementTime,e1ImplementTime); + } + return 0; + }); + } + } + // 认证类型 attestationType_dictText + if("attestationType_dictText".equals(orderByField)){ + if(OrderEnum.POSITIVE.getValue().equals(orderBy)){ + Collections.sort(dummyInventoryInfoEOList,(e1, e2)->{ + String e1AttestationType_dictText = StringUtils.isNotEmpty(e1.getAttestationType_dictText()) ? e1.getAttestationType_dictText() : ""; + String e2AttestationType_dictText = StringUtils.isNotEmpty(e2.getAttestationType_dictText()) ? e2.getAttestationType_dictText() : ""; + return comparator.compare(e1AttestationType_dictText,e2AttestationType_dictText); + }); + }else if(OrderEnum.REVERSE.getValue().equals(orderBy)){ + Collections.sort(dummyInventoryInfoEOList,(e1,e2)->{ + String e1AttestationType_dictText = StringUtils.isNotEmpty(e1.getAttestationType_dictText()) ? e1.getAttestationType_dictText() : ""; + String e2AttestationType_dictText = StringUtils.isNotEmpty(e2.getAttestationType_dictText()) ? e2.getAttestationType_dictText() : ""; + return comparator.compare(e2AttestationType_dictText,e1AttestationType_dictText); + }); + } + } + + // 认证级别 attestationRank + if("attestationRank".equals(orderByField)){ + if(OrderEnum.POSITIVE.getValue().equals(orderBy)){ + Collections.sort(dummyInventoryInfoEOList,(e1, e2)->{ + String e1AttestationRank_dictText = StringUtils.isNotEmpty(e1.getAttestationRank_dictText()) ? e1.getAttestationRank_dictText() : ""; + String e2AttestationRank_dictText = StringUtils.isNotEmpty(e2.getAttestationRank_dictText()) ? e2.getAttestationRank_dictText() : ""; + return comparator.compare(e1AttestationRank_dictText,e2AttestationRank_dictText); + }); + }else if(OrderEnum.REVERSE.getValue().equals(orderBy)){ + Collections.sort(dummyInventoryInfoEOList,(e1,e2)->{ + String e1AttestationRank_dictText = StringUtils.isNotEmpty(e1.getAttestationRank_dictText()) ? e1.getAttestationRank_dictText() : ""; + String e2AttestationRank_dictText = StringUtils.isNotEmpty(e2.getAttestationRank_dictText()) ? e2.getAttestationRank_dictText() : ""; + return comparator.compare(e2AttestationRank_dictText,e1AttestationRank_dictText); + }); + } + } + + // 适用增补件 applicableSupplement + if("applicableSupplement".equals(orderByField)){ + if(OrderEnum.POSITIVE.getValue().equals(orderBy)){ + Collections.sort(dummyInventoryInfoEOList,(e1, e2)->{ + String e1ApplicableSupplement = StringUtils.isNotEmpty(e1.getApplicableSupplement()) ? e1.getApplicableSupplement() : ""; + String e2ApplicableSupplement = StringUtils.isNotEmpty(e2.getApplicableSupplement()) ? e2.getApplicableSupplement() : ""; + return comparator.compare(e1ApplicableSupplement,e2ApplicableSupplement); + }); + }else if(OrderEnum.REVERSE.getValue().equals(orderBy)){ + Collections.sort(dummyInventoryInfoEOList,(e1,e2)->{ + String e1ApplicableSupplement = StringUtils.isNotEmpty(e1.getApplicableSupplement()) ? e1.getApplicableSupplement() : ""; + String e2ApplicableSupplement = StringUtils.isNotEmpty(e2.getApplicableSupplement()) ? e2.getApplicableSupplement() : ""; + return comparator.compare(e2ApplicableSupplement,e1ApplicableSupplement); + }); + } + } + + // 法规工程师 regulationOwnerName + /*if("regulationOwnerName".equals(orderByField)){ + if(OrderEnum.POSITIVE.getValue().equals(orderBy)){ + Collections.sort(dummyInventoryInfoEOList,(e1, e2)->{ + if(e1.getApplicableSupplement() != null && e2.getApplicableSupplement() != null){ + return comparator.compare(e1.getApplicableSupplement(),e2.getApplicableSupplement()); + } + return 0; + }); + }else if(OrderEnum.REVERSE.getValue().equals(orderBy)){ + Collections.sort(dummyInventoryInfoEOList,(e1,e2)->{ + if(e1.getApplicableSupplement() != null && e2.getApplicableSupplement() != null){ + return comparator.compare(e2.getApplicableSupplement(),e1.getApplicableSupplement()); + } + return 0; + }); + } + }*/ + // homologationEngineerName 认证工程师 + + // engineeringInterfacePersonName 工程接口人 + + // 备注 remark + if("remark".equals(orderByField)){ + if(OrderEnum.POSITIVE.getValue().equals(orderBy)){ + Collections.sort(dummyInventoryInfoEOList,(e1, e2)->{ + String e1Remark = StringUtils.isNotEmpty(e1.getRemark()) ? e1.getRemark() : ""; + String e2Remark = StringUtils.isNotEmpty(e2.getRemark()) ? e2.getRemark() : ""; + return comparator.compare(e1Remark,e2Remark); + }); + }else if(OrderEnum.REVERSE.getValue().equals(orderBy)){ + Collections.sort(dummyInventoryInfoEOList,(e1,e2)->{ + String e1Remark = StringUtils.isNotEmpty(e1.getRemark()) ? e1.getRemark() : ""; + String e2Remark = StringUtils.isNotEmpty(e2.getRemark()) ? e2.getRemark() : ""; + return comparator.compare(e2Remark,e1Remark); + }); + } + } + // 设计符合性 交付物 designDeliverableTemplateName + if("designDeliverableTemplateName".equals(orderByField)){ + if(OrderEnum.POSITIVE.getValue().equals(orderBy)){ + Collections.sort(dummyInventoryInfoEOList,(e1, e2)->{ + String e1DesignDeliverableTemplateName = StringUtils.isNotEmpty(e1.getDesignDeliverableTemplateName()) ? e1.getDesignDeliverableTemplateName() : ""; + String e2DesignDeliverableTemplateName = StringUtils.isNotEmpty(e2.getDesignDeliverableTemplateName()) ? e2.getDesignDeliverableTemplateName() : ""; + return comparator.compare(e1DesignDeliverableTemplateName,e2DesignDeliverableTemplateName); + }); + }else if(OrderEnum.REVERSE.getValue().equals(orderBy)){ + Collections.sort(dummyInventoryInfoEOList,(e1,e2)->{ + String e1DesignDeliverableTemplateName = StringUtils.isNotEmpty(e1.getDesignDeliverableTemplateName()) ? e1.getDesignDeliverableTemplateName() : ""; + String e2DesignDeliverableTemplateName = StringUtils.isNotEmpty(e2.getDesignDeliverableTemplateName()) ? e2.getDesignDeliverableTemplateName() : ""; + return comparator.compare(e2DesignDeliverableTemplateName,e1DesignDeliverableTemplateName); + }); + } + } + // 设计符合性 责任人 designDuty_dictText + if("designDuty_dictText".equals(orderByField)){ + if(OrderEnum.POSITIVE.getValue().equals(orderBy)){ + Collections.sort(dummyInventoryInfoEOList,(e1, e2)->{ + String e1DesignDuty_dictText = StringUtils.isNotEmpty(e1.getDesignDuty_dictText()) ? e1.getDesignDuty_dictText() : ""; + String e2DesignDuty_dictText = StringUtils.isNotEmpty(e2.getDesignDuty_dictText()) ? e2.getDesignDuty_dictText() : ""; + return comparator.compare(e1DesignDuty_dictText,e2DesignDuty_dictText); + }); + }else if(OrderEnum.REVERSE.getValue().equals(orderBy)){ + Collections.sort(dummyInventoryInfoEOList,(e1,e2)->{ + String e1DesignDuty_dictText = StringUtils.isNotEmpty(e1.getDesignDuty_dictText()) ? e1.getDesignDuty_dictText() : ""; + String e2DesignDuty_dictText = StringUtils.isNotEmpty(e2.getDesignDuty_dictText()) ? e2.getDesignDuty_dictText() : ""; + return comparator.compare(e2DesignDuty_dictText,e1DesignDuty_dictText); + }); + } + } + // 设计符合性 交付物说明 designRemark + if("designRemark".equals(orderByField)){ + if(OrderEnum.POSITIVE.getValue().equals(orderBy)){ + Collections.sort(dummyInventoryInfoEOList,(e1, e2)->{ + String e1DesignRemark = StringUtils.isNotEmpty(e1.getDesignRemark()) ? e1.getDesignRemark() : ""; + String e2DesignRemark = StringUtils.isNotEmpty(e2.getDesignRemark()) ? e2.getDesignRemark() : ""; + return comparator.compare(e1DesignRemark,e2DesignRemark); + }); + }else if(OrderEnum.REVERSE.getValue().equals(orderBy)){ + Collections.sort(dummyInventoryInfoEOList,(e1,e2)->{ + String e1DesignRemark = StringUtils.isNotEmpty(e1.getDesignRemark()) ? e1.getDesignRemark() : ""; + String e2DesignRemark = StringUtils.isNotEmpty(e2.getDesignRemark()) ? e2.getDesignRemark() : ""; + return comparator.compare(e2DesignRemark,e1DesignRemark); + }); + } + } + + // 验证符合性 交付物 verifyDeliverableTemplateName + if("verifyDeliverableTemplateName".equals(orderByField)){ + if(OrderEnum.POSITIVE.getValue().equals(orderBy)){ + Collections.sort(dummyInventoryInfoEOList,(e1, e2)->{ + String e1VerifyDeliverableTemplateName = StringUtils.isNotEmpty(e1.getVerifyDeliverableTemplateName()) ? e1.getVerifyDeliverableTemplateName() : ""; + String e2VerifyDeliverableTemplateName = StringUtils.isNotEmpty(e2.getVerifyDeliverableTemplateName()) ? e2.getVerifyDeliverableTemplateName() : ""; + return comparator.compare(e1VerifyDeliverableTemplateName,e2VerifyDeliverableTemplateName); + }); + }else if(OrderEnum.REVERSE.getValue().equals(orderBy)){ + Collections.sort(dummyInventoryInfoEOList,(e1,e2)->{ + String e1VerifyDeliverableTemplateName = StringUtils.isNotEmpty(e1.getVerifyDeliverableTemplateName()) ? e1.getVerifyDeliverableTemplateName() : ""; + String e2VerifyDeliverableTemplateName = StringUtils.isNotEmpty(e2.getVerifyDeliverableTemplateName()) ? e2.getVerifyDeliverableTemplateName() : ""; + return comparator.compare(e2VerifyDeliverableTemplateName,e1VerifyDeliverableTemplateName); + }); + } + } + // 验证符合性 责任人 verifyDuty_dictText + if("verifyDuty_dictText".equals(orderByField)){ + if(OrderEnum.POSITIVE.getValue().equals(orderBy)){ + Collections.sort(dummyInventoryInfoEOList,(e1, e2)->{ + String e1VerifyDuty_dictText = StringUtils.isNotEmpty(e1.getVerifyDuty_dictText()) ? e1.getVerifyDuty_dictText() : ""; + String e2VerifyDuty_dictText = StringUtils.isNotEmpty(e2.getVerifyDuty_dictText()) ? e2.getVerifyDuty_dictText() : ""; + return comparator.compare(e1VerifyDuty_dictText,e2VerifyDuty_dictText); + }); + }else if(OrderEnum.REVERSE.getValue().equals(orderBy)){ + Collections.sort(dummyInventoryInfoEOList,(e1,e2)->{ + String e1VerifyDuty_dictText = StringUtils.isNotEmpty(e1.getVerifyDuty_dictText()) ? e1.getVerifyDuty_dictText() : ""; + String e2VerifyDuty_dictText = StringUtils.isNotEmpty(e2.getVerifyDuty_dictText()) ? e2.getVerifyDuty_dictText() : ""; + return comparator.compare(e2VerifyDuty_dictText,e1VerifyDuty_dictText); + }); + } + } + // 设计符合性 交付物说明 verifyRemark + if("verifyRemark".equals(orderByField)){ + if(OrderEnum.POSITIVE.getValue().equals(orderBy)){ + Collections.sort(dummyInventoryInfoEOList,(e1, e2)->{ + String e1VerifyRemark = StringUtils.isNotEmpty(e1.getVerifyRemark()) ? e1.getVerifyRemark() : ""; + String e2VerifyRemark = StringUtils.isNotEmpty(e2.getVerifyRemark()) ? e2.getVerifyRemark() : ""; + return comparator.compare(e1VerifyRemark,e2VerifyRemark); + }); + }else if(OrderEnum.REVERSE.getValue().equals(orderBy)){ + Collections.sort(dummyInventoryInfoEOList,(e1,e2)->{ + String e1VerifyRemark = StringUtils.isNotEmpty(e1.getVerifyRemark()) ? e1.getVerifyRemark() : ""; + String e2VerifyRemark = StringUtils.isNotEmpty(e2.getVerifyRemark()) ? e2.getVerifyRemark() : ""; + return comparator.compare(e2VerifyRemark,e1VerifyRemark); + }); + } + } //适用范围 if("shi4Yong4Fan4Wei2".equals(orderByField)){ if(OrderEnum.POSITIVE.getValue().equals(orderBy)){