|
@@ -473,10 +473,15 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
|
|
|
} else if (listAdmissionVo.getType() == 5) {
|
|
|
jsonObject.put("name", "物资车");
|
|
|
}
|
|
|
- jsonObject.put("count", listAdmissionVo.getCount());
|
|
|
+ jsonObject.put("value", listAdmissionVo.getCount());
|
|
|
jsonArray.add(jsonObject);
|
|
|
}
|
|
|
- JSONArray array = jsonArraySort(jsonArray, "count", true);
|
|
|
+ JSONArray array = jsonArraySort(jsonArray, "value", true);
|
|
|
+ for (int i = 0; i < array.size(); i++) {
|
|
|
+ JSONObject jsonObject = array.getJSONObject(i);
|
|
|
+ jsonObject.put("rank", i+1);
|
|
|
+ }
|
|
|
+
|
|
|
return new Result(ResultCode.SUCCESS, array);
|
|
|
}
|
|
|
|