Commit e650e776 authored by 韩桐桐's avatar 韩桐桐

fix(jg):下载汇总表

parent 25db4bad
...@@ -1817,7 +1817,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD ...@@ -1817,7 +1817,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
LambdaQueryWrapper<JgRegistrationHistory> lambda = new QueryWrapper<JgRegistrationHistory>().lambda(); LambdaQueryWrapper<JgRegistrationHistory> lambda = new QueryWrapper<JgRegistrationHistory>().lambda();
lambda.in(JgRegistrationHistory::getCurrentDocumentId, useRegistrationSeqs); lambda.in(JgRegistrationHistory::getCurrentDocumentId, useRegistrationSeqs);
List<JgRegistrationHistory> registrationHistoryList = jgRegistrationHistoryService.getBaseMapper().selectList(lambda); List<JgRegistrationHistory> registrationHistoryList = jgRegistrationHistoryService.getBaseMapper().selectList(lambda);
if(!ValidationUtil.isEmpty(registrationHistoryList)){ if(ValidationUtil.isEmpty(registrationHistoryList)){
throw new BadRequest("没有查询到汇总信息!"); throw new BadRequest("没有查询到汇总信息!");
} }
JSONArray allEquipment = new JSONArray(); JSONArray allEquipment = new JSONArray();
...@@ -1830,7 +1830,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD ...@@ -1830,7 +1830,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
JSONObject equipmentItem = equipmentLists.getJSONObject(i); JSONObject equipmentItem = equipmentLists.getJSONObject(i);
equipmentItem.put("useDate", timeToMonths(useDateValue)); equipmentItem.put("useDate", timeToMonths(useDateValue));
} }
allEquipment.add(equipmentLists); allEquipment.addAll(equipmentLists);
}); });
total = allEquipment.size(); total = allEquipment.size();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment