WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev_2nd_period_test' into dev_2nd_period_test

Browse Source
This commit is contained in:
CD
2022-12-27 16:11:46 +08:00
parent ca1fb97fc5 1ccb5b6663
commit 8cb780919d
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/controller/ParamsExportTemplateEOController.java
+4 -4
View File
@@ -125,19 +125,19 @@ public class ParamsExportTemplateEOController extends JeroController<ParamsExpor
String regionName = regionDictItemList.stream().filter(e -> e.getItemValue().equals(s)).map(f -> f.getItemText()).collect(Collectors.joining(",")); String regionName = regionDictItemList.stream().filter(e -> e.getItemValue().equals(s)).map(f -> f.getItemText()).collect(Collectors.joining(","));
regionBuilder.append(regionName).append(","); regionBuilder.append(regionName).append(",");
} }
paramsExportTemplateEOTemp.setRegionName(regionBuilder.substring(0, regionBuilder.toString().length() - 1)); paramsExportTemplateEOTemp.setRegion_dictText(regionBuilder.substring(0, regionBuilder.toString().length() - 1));
}else{ }else{
paramsExportTemplateEOTemp.setRegionName(""); paramsExportTemplateEOTemp.setRegion_dictText("");
} }
} }
Collator comparator = Collator.getInstance(Locale.CHINESE); Collator comparator = Collator.getInstance(Locale.CHINESE);
if (OrderEnum.POSITIVE.getValue().equals(paramsExportTemplateEO.getOrderBy())) { if (OrderEnum.POSITIVE.getValue().equals(paramsExportTemplateEO.getOrderBy())) {
Collections.sort(list, (e1, e2) -> { Collections.sort(list, (e1, e2) -> {
return comparator.compare(e1.getRegionName(), e2.getRegionName()); return comparator.compare(e1.getRegion_dictText(), e2.getRegion_dictText());
}); });
} else if (OrderEnum.REVERSE.getValue().equals(paramsExportTemplateEO.getOrderBy())) { } else if (OrderEnum.REVERSE.getValue().equals(paramsExportTemplateEO.getOrderBy())) {
Collections.sort(list, (e1, e2) -> { Collections.sort(list, (e1, e2) -> {
return comparator.compare(e2.getRegionName(), e1.getRegionName()); return comparator.compare(e2.getRegion_dictText(), e1.getRegion_dictText());
}); });
} }
pageList = getPages(pageNo, pageSize, list); pageList = getPages(pageNo, pageSize, list);
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/entity/ParamsExportTemplateEO.java
+1 -1
View File
@@ -94,6 +94,6 @@ public class ParamsExportTemplateEO implements Serializable {
//适用地区 //适用地区
private String region; private String region;
@TableField(exist = false) @TableField(exist = false)
private String regionName; private String region_dictText;
} }