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

This commit is contained in:
zhangqinbin
2022-01-20 09:03:49 +08:00

View File

@ -162,7 +162,10 @@ public class ReviewReportImpl implements ExportService {
String finalZbfs = zbfs;
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 -> {
Map<String, Object> m1 = (Map<String, Object>) m;
return String.valueOf(m1.get("jgdf"));
}).reversed()).collect(Collectors.toList());
for (int i = 0; i < sortList3.size(); i++) {
int num = i + 1;
sortList3.get(i).put("num", num);