|
@@ -371,6 +371,7 @@ public class ErpDataServiceImpl implements IErpDataService {
|
|
|
System.out.println("yearMonth="+yearMonth);
|
|
|
//
|
|
|
List<Object[]> costList = tDeliveryRepo.getCostWithManyFarm(yearMonth);
|
|
|
+ System.out.println("costList.size="+costList.size());
|
|
|
JSONArray costJa = new JSONArray();
|
|
|
for(int a=0;a<costList.size();a++){
|
|
|
Object[] costObj = (Object[]) costList.get(a);
|
|
@@ -560,10 +561,14 @@ public class ErpDataServiceImpl implements IErpDataService {
|
|
|
Object[] planObj = (Object[]) payableList.get(a);
|
|
|
JSONObject dataJo = new JSONObject();
|
|
|
produceJa.add(dataJo);
|
|
|
- //数据
|
|
|
- dataJo.put("data", planObj[0]);
|
|
|
- //名称
|
|
|
- dataJo.put("mc", planObj[1]);
|
|
|
+ //排名
|
|
|
+ dataJo.put("rank", planObj[0]);
|
|
|
+ //牧场名称
|
|
|
+ dataJo.put("mcmc", planObj[1]);
|
|
|
+ //金额
|
|
|
+ dataJo.put("je", planObj[2]);
|
|
|
+ //应付单位
|
|
|
+ dataJo.put("supplier", planObj[3]);
|
|
|
}
|
|
|
return new Result(ResultCode.SUCCESS,produceJa);
|
|
|
}
|