diff --git a/src/main/java/com/hivekion/statistic/service/impl/ScenarioServiceImpl.java b/src/main/java/com/hivekion/statistic/service/impl/ScenarioServiceImpl.java index 5afacdc..ac39ceb 100644 --- a/src/main/java/com/hivekion/statistic/service/impl/ScenarioServiceImpl.java +++ b/src/main/java/com/hivekion/statistic/service/impl/ScenarioServiceImpl.java @@ -102,6 +102,12 @@ public class ScenarioServiceImpl implements ScenarioService { staffList = fightpowerstaffService.queryByOrgIds(orgList); if(CollectionUtil.isEmpty(staffList)){ staffList = new ArrayList<>(); + }else{ + int sum = staffList.stream() + .mapToInt(Fightpowerstaff::getNumber) + .sum(); + scenarioInfo.getPerson().setCurrent(sum); + scenarioInfo.getPerson().setTotal(sum); } //获取物资信息 suppliers = orgSupplierService.selectByOrgIds(orgList); @@ -248,6 +254,12 @@ public class ScenarioServiceImpl implements ScenarioService { staffList = fightpowerstaffService.queryByOrgIds(orgList); if(CollectionUtil.isEmpty(staffList)){ staffList = new ArrayList<>(); + }else{ + int sum = staffList.stream() + .mapToInt(Fightpowerstaff::getNumber) + .sum(); + scenarioInfo.getJbxx().getPerson().setCurrent(sum); + scenarioInfo.getJbxx().getPerson().setTotal(sum); } //获取物资信息 suppliers = orgSupplierService.selectByOrgIds(orgList);