|
|
@@ -1589,43 +1589,83 @@ public class BenchmarkingService {
|
|
|
}
|
|
|
SortUtils.sort(resultList, "gzssdl", SortUtils.ASC);
|
|
|
for (int i = 0; i < resultList.size(); i++) {
|
|
|
- resultList.get(i).setGzssdlpm(i + 1);
|
|
|
+ if (resultList.get(i).getGzssdl() == 0) {
|
|
|
+ resultList.get(i).setGzssdlpm(1);
|
|
|
+ } else {
|
|
|
+ resultList.get(i).setGzssdlpm(i + 1);
|
|
|
+ }
|
|
|
}
|
|
|
SortUtils.sort(resultList, "gzssl", SortUtils.ASC);
|
|
|
for (int i = 0; i < resultList.size(); i++) {
|
|
|
- resultList.get(i).setGzsslpm(i + 1);
|
|
|
+ if (resultList.get(i).getGzssl() == 0) {
|
|
|
+ resultList.get(i).setGzsslpm(1);
|
|
|
+ } else {
|
|
|
+ resultList.get(i).setGzsslpm(i + 1);
|
|
|
+ }
|
|
|
}
|
|
|
SortUtils.sort(resultList, "jxssdl", SortUtils.ASC);
|
|
|
for (int i = 0; i < resultList.size(); i++) {
|
|
|
- resultList.get(i).setJxssdlpm(i + 1);
|
|
|
+ if (resultList.get(i).getJxssdl() == 0) {
|
|
|
+ resultList.get(i).setJxssdlpm(1);
|
|
|
+ } else {
|
|
|
+ resultList.get(i).setJxssdlpm(i + 1);
|
|
|
+ }
|
|
|
}
|
|
|
SortUtils.sort(resultList, "jxssl", SortUtils.ASC);
|
|
|
for (int i = 0; i < resultList.size(); i++) {
|
|
|
- resultList.get(i).setJxsslpm(i + 1);
|
|
|
+ if (resultList.get(i).getJxssl() == 0) {
|
|
|
+ resultList.get(i).setJxsslpm(1);
|
|
|
+ } else {
|
|
|
+ resultList.get(i).setJxsslpm(i + 1);
|
|
|
+ }
|
|
|
}
|
|
|
SortUtils.sort(resultList, "xdssdl", SortUtils.ASC);
|
|
|
for (int i = 0; i < resultList.size(); i++) {
|
|
|
- resultList.get(i).setXdssdlpm(i + 1);
|
|
|
+ if (resultList.get(i).getXdssdl() == 0) {
|
|
|
+ resultList.get(i).setXdssdlpm(1);
|
|
|
+ } else {
|
|
|
+ resultList.get(i).setXdssdlpm(i + 1);
|
|
|
+ }
|
|
|
}
|
|
|
SortUtils.sort(resultList, "qfl", SortUtils.ASC);
|
|
|
for (int i = 0; i < resultList.size(); i++) {
|
|
|
- resultList.get(i).setQflpm(i + 1);
|
|
|
+ if (resultList.get(i).getQfl() == 0) {
|
|
|
+ resultList.get(i).setQflpm(1);
|
|
|
+ } else {
|
|
|
+ resultList.get(i).setQflpm(i + 1);
|
|
|
+ }
|
|
|
}
|
|
|
SortUtils.sort(resultList, "xnssdl", SortUtils.ASC);
|
|
|
for (int i = 0; i < resultList.size(); i++) {
|
|
|
- resultList.get(i).setXnssdlpm(i + 1);
|
|
|
+ if (resultList.get(i).getXnssdl() == 0) {
|
|
|
+ resultList.get(i).setXnssdlpm(1);
|
|
|
+ } else {
|
|
|
+ resultList.get(i).setXnssdlpm(i + 1);
|
|
|
+ }
|
|
|
}
|
|
|
SortUtils.sort(resultList, "xnssl", SortUtils.ASC);
|
|
|
for (int i = 0; i < resultList.size(); i++) {
|
|
|
- resultList.get(i).setXnsslpm(i + 1);
|
|
|
+ if (resultList.get(i).getXnssl() == 0) {
|
|
|
+ resultList.get(i).setXnsslpm(1);
|
|
|
+ } else {
|
|
|
+ resultList.get(i).setXnsslpm(i + 1);
|
|
|
+ }
|
|
|
}
|
|
|
SortUtils.sort(resultList, "slssdl", SortUtils.ASC);
|
|
|
for (int i = 0; i < resultList.size(); i++) {
|
|
|
- resultList.get(i).setSlssdlpm(i + 1);
|
|
|
+ if (resultList.get(i).getSlssdl() == 0) {
|
|
|
+ resultList.get(i).setSlssdlpm(1);
|
|
|
+ } else {
|
|
|
+ resultList.get(i).setSlssdlpm(i + 1);
|
|
|
+ }
|
|
|
}
|
|
|
SortUtils.sort(resultList, "slssl", SortUtils.ASC);
|
|
|
for (int i = 0; i < resultList.size(); i++) {
|
|
|
- resultList.get(i).setSlsslpm(i + 1);
|
|
|
+ if (resultList.get(i).getSlssl() == 0) {
|
|
|
+ resultList.get(i).setSlsslpm(1);
|
|
|
+ } else {
|
|
|
+ resultList.get(i).setSlsslpm(i + 1);
|
|
|
+ }
|
|
|
}
|
|
|
Integer ls = list1.size();
|
|
|
|