Merge remote-tracking branch 'origin/V1' into V1

web/src/main/java/com/jpsoft/smart/modules/base/controller/ReportController.java

@@ -99,6 +99,7 @@ public class ReportController {
                     CompanyRecordReportDTO companyRecordReportDTO = new CompanyRecordReportDTO();
                     //查询公司的所有未删除对象
                     List<PersonInfo> personInfoList = personInfoService.findByCompanyId(companyInfo.getId());
+                    Integer personTotalNum = personInfoList.size();
 
                     //总人数
                     totalPersonNum = totalPersonNum+ personInfoList.size();
@@ -132,7 +133,7 @@ public class ReportController {
 
                //     Integer checkPersonTotal = personDeviceFilterLogService.getDayCheckedPersonNumByCompanyList(beginTime,endTime,companyInfoList,null);
                     companyRecordReportDTO.setCompanyName(companyInfo.getName());
-                    companyRecordReportDTO.setPersonTotal(personInfoList.size());
+                    companyRecordReportDTO.setPersonTotal(personTotalNum);
                     companyRecordReportDTO.setCheckPersonTotal(personDeviceFilterLogs.size());
                     companyRecordReportDTO.setUnCheckPersonName(name);
                     companyRecordReportDTOS.add(companyRecordReportDTO);