参数导出模板管理--表头适用地区字段排序

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/controller/ParamsExportTemplateEOController.java

@@ -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(","));
 						regionBuilder.append(regionName).append(",");
 					}
-					paramsExportTemplateEOTemp.setRegionName(regionBuilder.substring(0, regionBuilder.toString().length() - 1));
+					paramsExportTemplateEOTemp.setRegion_dictText(regionBuilder.substring(0, regionBuilder.toString().length() - 1));
 				}else{
-					paramsExportTemplateEOTemp.setRegionName("");
+					paramsExportTemplateEOTemp.setRegion_dictText("");
 				}
 			}
 			Collator comparator = Collator.getInstance(Locale.CHINESE);
 			if (OrderEnum.POSITIVE.getValue().equals(paramsExportTemplateEO.getOrderBy())) {
 				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())) {
 				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);

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/entity/ParamsExportTemplateEO.java

@@ -94,6 +94,6 @@ public class ParamsExportTemplateEO implements Serializable {
     //适用地区
     private String region;
     @TableField(exist = false)
-    private String regionName;
+    private String region_dictText;
 
 }