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 4f206705..4e4443ee 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 @@ -191,7 +191,7 @@ public class SarStandardComplianceAssessResultController { Page p1=new Page(); IPage page = iSarStandardComplianceProductAssessService.page(iPage, queryWrapper); BeanUtils.copyProperties(page,p1); - p1.setRecords(page.getRecords()); + p1.setRecords(orderUtils(page.getRecords())); p1.setTotal(page.getTotal()); map.put("unfit",p1); QueryWrapper queryWrapper1 = new QueryWrapper<>(); @@ -203,7 +203,7 @@ public class SarStandardComplianceAssessResultController { IPage page1 = iSarStandardComplianceProductAssessService.page(iPage, queryWrapper1); Page p2=new Page(); BeanUtils.copyProperties(page1,p2); - p2.setRecords(page1.getRecords()); + p2.setRecords(orderUtils(page1.getRecords())); p2.setTotal(page1.getTotal()); map.put("fit",p2); QueryWrapper queryWrapper2 = new QueryWrapper<>(); @@ -213,10 +213,50 @@ public class SarStandardComplianceAssessResultController { queryWrapper2.orderByAsc("product_name"); queryWrapper2.orderByAsc("standard_item"); IPage page2 = iSarStandardComplianceProductAssessService.page(iPage, queryWrapper2); + page2.setRecords(orderUtils(page2.getRecords())); map.put("noFit",page2); return Result.success(map); } + private List orderUtils(List sarStandardCompliance){ + Map> stringMap=new HashMap<>(); + List orderKey=new ArrayList<>(); + + for (SarStandardComplianceProductAssess s:sarStandardCompliance) { + if (null!=s.getStandardItem()) { + String[] as=(s.getStandardItem()+",").split(","); + if (orderKey.contains(Integer.valueOf(as[0].trim().toString()))) { + stringMap.get(Integer.valueOf(as[0].trim().toString())).add(s); + } else { + orderKey.add(Integer.valueOf(as[0].trim().toString())); + List assesses2 = new ArrayList<>(); + assesses2.add(s); + stringMap.put(Integer.valueOf(as[0].trim().toString()), assesses2); + } + }else { + if (null!=stringMap.get(0)) { + stringMap.get(0).add(s); + }else { + List assesses = new ArrayList<>(); + assesses.add(s); + stringMap.put(0,assesses); + orderKey.add(0); + } + } + + + + } + Collections.sort(orderKey,(o1, o2) -> { + return (o1 -o2); + }); + List res=new ArrayList<>(); + orderKey.forEach(integer -> { + res.addAll(stringMap.get(integer)); + }); + return res; + } + @ApiOperation(value = "标准涉及项目复合性") @GetMapping("/productNew") public ResponseMessage> selectProduct(unCountDTO eo) throws Exception {