修改排序字段
This commit is contained in:
@ -122,9 +122,7 @@ public class ReviewReportImpl implements ExportService {
|
|||||||
|
|
||||||
for (int i = 0; i < registerList.size(); i++) {
|
for (int i = 0; i < registerList.size(); i++) {
|
||||||
Map<String, Object> map = new HashMap<>(16);
|
Map<String, Object> map = new HashMap<>(16);
|
||||||
int num = i + 1;
|
|
||||||
BizSupplierRegister register = registerList.get(i);
|
BizSupplierRegister register = registerList.get(i);
|
||||||
map.put("num", num);
|
|
||||||
map.put("id", register.getCompanyId());
|
map.put("id", register.getCompanyId());
|
||||||
map.put("tbr", register.getCompanyName());
|
map.put("tbr", register.getCompanyName());
|
||||||
list3.add(map);
|
list3.add(map);
|
||||||
@ -165,7 +163,18 @@ public class ReviewReportImpl implements ExportService {
|
|||||||
String finalZbfs = zbfs;
|
String finalZbfs = zbfs;
|
||||||
String finalPbwyhzz = pbwyhzz;
|
String finalPbwyhzz = pbwyhzz;
|
||||||
List<Map<String, Object>> sortList3 = list3.stream().sorted(Comparator.comparing(m -> String.valueOf(m.get("bj")))).collect(Collectors.toList());
|
List<Map<String, Object>> sortList3 = list3.stream().sorted(Comparator.comparing(m -> String.valueOf(m.get("bj")))).collect(Collectors.toList());
|
||||||
List<Map<String, Object>> list4 = list3.stream().sorted(Comparator.comparing(m -> String.valueOf(m.get("zhdf")))).collect(Collectors.toList());
|
for (int i = 0; i < sortList3.size(); i++) {
|
||||||
|
int num = i + 1;
|
||||||
|
sortList3.get(i).put("num", num);
|
||||||
|
}
|
||||||
|
List<Map<String, Object>> list4 = list3.stream().sorted(Comparator.comparing(m -> {
|
||||||
|
Map<String, Object> m1 = (Map<String, Object>) m;
|
||||||
|
return String.valueOf(m1.get("zhdf"));
|
||||||
|
}).reversed()).collect(Collectors.toList());
|
||||||
|
for (int i = 0; i < list4.size(); i++) {
|
||||||
|
int num = i + 1;
|
||||||
|
list4.get(i).put("num", num);
|
||||||
|
}
|
||||||
Map<String, Object> all = new HashMap<String, Object>() {{
|
Map<String, Object> all = new HashMap<String, Object>() {{
|
||||||
put("table1", list1);
|
put("table1", list1);
|
||||||
put("table2", list2);
|
put("table2", list2);
|
||||||
|
Reference in New Issue
Block a user