Commit e0a2099c authored by suhuiguang's avatar suhuiguang

fix(jyjc):报检匹配

1.排序问题
parent 7bd6ac06
...@@ -116,6 +116,12 @@ public class RuleActionHandler { ...@@ -116,6 +116,12 @@ public class RuleActionHandler {
unitDto.setSort(0); unitDto.setSort(0);
continue; continue;
} }
if(unitDto.getAgencyClassify() == null){
unitDto.setSort(2);
continue;
}
if(unitDto.getAgencyClassify().contains(JyAgencyClassifyEnum.SBGY.getCode())){ if(unitDto.getAgencyClassify().contains(JyAgencyClassifyEnum.SBGY.getCode())){
unitDto.setSort(-1); unitDto.setSort(-1);
continue; continue;
...@@ -124,6 +130,7 @@ public class RuleActionHandler { ...@@ -124,6 +130,7 @@ public class RuleActionHandler {
unitDto.setSort(1); unitDto.setSort(1);
} }
} }
// 升序
return units.stream().sorted(Comparator.comparing(RuleInspectUnitIndoDto::getSort, Comparator.nullsLast(Integer::compareTo))).collect(Collectors.toList()); return units.stream().sorted(Comparator.comparing(RuleInspectUnitIndoDto::getSort, Comparator.nullsLast(Integer::compareTo))).collect(Collectors.toList());
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment