From 75be6c54cc1ec0ed380606c7c41608e797fb5deb Mon Sep 17 00:00:00 2001 From: gaojiabao Date: Fri, 12 May 2023 15:53:25 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=92=E5=BA=8F=20=E4=BB=85=E6=8E=92?= =?UTF-8?q?=E5=BA=8F=E6=95=B0=E5=AD=97=20=E4=B8=8D=E6=8E=92=E5=BA=8F?= =?UTF-8?q?=E6=96=87=E5=AD=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SarStandardComplianceAssessResultController.java | 11 ++++++++++- .../entity/InterpretationEO.java | 3 +++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java index 680d71df..12602b7b 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java @@ -292,6 +292,11 @@ public class SarStandardComplianceAssessResultController { iPage.setTotal(datasCount); iPage.setRecords(standards); while (iPage.getRecords().remove(null)) ; + if(StringUtils.isNotBlank(eo.getOrder())){ + if(eo.getOrder().equals("desc")){ + iPage.getRecords().sort((m1,m2)-> m2.getSpecificItem().compareTo(m1.getSpecificItem())); + } + } return Result.success(iPage); } else { IPage iPage = new Page<>(eo.getCurrent(), eo.getSize()); @@ -307,7 +312,11 @@ public class SarStandardComplianceAssessResultController { if (eo.getStandId() != null) queryWrapper.eq("STAND_ID", eo.getStandId()); IPage page = iSarInterpretationForeignStandardService.page(iPage, queryWrapper); while (page.getRecords().remove(null)) ; - + if(StringUtils.isNotBlank(eo.getOrder())){ + if(eo.getOrder().equals("desc")){ + iPage.getRecords().sort((m1,m2)-> m2.getSpecificItem().compareTo(m1.getSpecificItem())); + } + } return Result.success(page); } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/InterpretationEO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/InterpretationEO.java index 660234f8..b7c06f96 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/InterpretationEO.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/InterpretationEO.java @@ -51,4 +51,7 @@ public class InterpretationEO { @ApiModelProperty("页内数量") private Integer size=20; + @ApiModelProperty("排序") + private String order; + }