Merge branch 'server-165' of uskycloud/usky-modules into master

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/impl/DemInspectListServiceImpl.java

@@ -74,28 +74,32 @@ public class DemInspectListServiceImpl extends AbstractCrudService<DemInspectLis
 
         if(CollectionUtils.isNotEmpty(comoanyList)){
             List<String> companyList = new ArrayList<>();
-            for(int j=0;j<companyIdList.size();j++){
-                companyList.add(companyIdList.get(j).getCompanyId());
+            if(CollectionUtils.isNotEmpty(companyIdList)){
+                for(int j=0;j<companyIdList.size();j++){
+                    companyList.add(companyIdList.get(j).getCompanyId());
+                }
             }
 
-
             LambdaQueryWrapper<DemInspectList> QueryWrapper1 = Wrappers.lambdaQuery();
             if(StringUtils.isNotBlank(companyName)){
                 if(CollectionUtils.isNotEmpty(companyList)){
-
+                    QueryWrapper1.in(DemInspectList::getCompanyId,companyList)
+                            .like(StringUtils.isNotBlank(inspectCode), DemInspectList::getInspectCode, inspectCode)
+                            .like(StringUtils.isNotBlank(deviceCode), DemInspectList::getDeviceId, deviceCode)
+                            .eq(null!=handlingStatus, DemInspectList::getHandlingStatus, handlingStatus);
+                    QueryWrapper1.orderByDesc(DemInspectList::getId);
                 }else{
                     companyList.add(null);
+                    QueryWrapper1.like(StringUtils.isNotBlank(inspectCode), DemInspectList::getInspectCode, inspectCode)
+                            .like(StringUtils.isNotBlank(deviceCode), DemInspectList::getDeviceId, deviceCode)
+                            .eq(null!=handlingStatus, DemInspectList::getHandlingStatus, handlingStatus);
+                    QueryWrapper1.orderByDesc(DemInspectList::getId);
                 }
-                QueryWrapper1.in(DemInspectList::getCompanyId,companyList)
-                        .like(StringUtils.isNotBlank(inspectCode), DemInspectList::getInspectCode, inspectCode)
-                        .like(StringUtils.isNotBlank(deviceCode), DemInspectList::getDeviceId, deviceCode)
-                        .eq(handlingStatus != null, DemInspectList::getHandlingStatus, handlingStatus);
-                QueryWrapper1.orderByDesc(DemInspectList::getId);
             }
             else{
                 QueryWrapper1.like(StringUtils.isNotBlank(inspectCode), DemInspectList::getInspectCode, inspectCode)
                         .like(StringUtils.isNotBlank(deviceCode), DemInspectList::getDeviceId, deviceCode)
-                        .eq(handlingStatus != null, DemInspectList::getHandlingStatus, handlingStatus);
+                        .eq(null!=handlingStatus, DemInspectList::getHandlingStatus, handlingStatus);
                 QueryWrapper1.orderByDesc(DemInspectList::getId);
             }
             page = this.page(page, QueryWrapper1);
@@ -109,30 +113,34 @@ public class DemInspectListServiceImpl extends AbstractCrudService<DemInspectLis
                     QueryWrapperDevice.select(BaseDevice::getDeviceCode,BaseDevice::getDeviceName,BaseDevice::getInstallAddress)
                             .eq(BaseDevice::getDeviceCode, page.getRecords().get(k).getDeviceId());
                     List<BaseDevice> deviceList = baseDeviceService.list(QueryWrapperDevice);
-                    inspectDetailVO.setDeviceName(deviceList.get(0).getDeviceName());
-                    inspectDetailVO.setInstallAddress(deviceList.get(0).getInstallAddress());
+                    if(CollectionUtils.isNotEmpty(deviceList)){
+                        inspectDetailVO.setDeviceName(deviceList.get(0).getDeviceName());
+                        inspectDetailVO.setInstallAddress(deviceList.get(0).getInstallAddress());
+                    }
                     //设备报告内容和报告时间
                     LambdaQueryWrapper<AlarmFire> QueryWrapperAlarm = Wrappers.lambdaQuery();
                     QueryWrapperAlarm.select(AlarmFire::getAlarmTime, AlarmFire::getAttributeValue2, AlarmFire::getAttributeValue4)
                             .eq(AlarmFire::getId, page.getRecords().get(k).getAlarmId());
                     List<AlarmFire> alarmFireList = alarmFireService.list(QueryWrapperAlarm);
-                    inspectDetailVO.setAlarmTime(alarmFireList.get(0).getAlarmTime());
-                    inspectDetailVO.setDeviceContent(alarmFireList.get(0).getAttributeValue2()+" "+alarmFireList.get(0).getAttributeValue4());
-
+                    if(CollectionUtils.isNotEmpty(alarmFireList)){
+                        inspectDetailVO.setAlarmTime(alarmFireList.get(0).getAlarmTime());
+                        inspectDetailVO.setDeviceContent(alarmFireList.get(0).getAttributeValue2()+" "+alarmFireList.get(0).getAttributeValue4());
+                    }
                     LambdaQueryWrapper<BaseCompanyPerson> queryWrapperPerson = Wrappers.lambdaQuery();
                     queryWrapperPerson.select(BaseCompanyPerson::getCompanyName, BaseCompanyPerson::getDelegateName, BaseCompanyPerson::getDelegatePhone,
                             BaseCompanyPerson::getFireDutyName, BaseCompanyPerson::getFireDutyPhone,
                             BaseCompanyPerson::getFireManageName, BaseCompanyPerson::getFireManagePhone)
                             .in(BaseCompanyPerson::getCompanyId, page.getRecords().get(k).getCompanyId());
                     List<BaseCompanyPerson> companyPersonList = baseCompanyPersonService.list(queryWrapperPerson);
-                    inspectDetailVO.setCompanyName(companyPersonList.get(0).getCompanyName());
-                    inspectDetailVO.setDelegateName(companyPersonList.get(0).getDelegateName());
-                    inspectDetailVO.setDelegatePhone(companyPersonList.get(0).getDelegatePhone());
-                    inspectDetailVO.setFireDutyName(companyPersonList.get(0).getFireDutyName());
-                    inspectDetailVO.setFireDutyPhone(companyPersonList.get(0).getFireDutyPhone());
-                    inspectDetailVO.setFireManageName(companyPersonList.get(0).getFireManageName());
-                    inspectDetailVO.setFireManagePhone(companyPersonList.get(0).getFireManagePhone());
-
+                    if(CollectionUtils.isNotEmpty(companyPersonList)){
+                        inspectDetailVO.setCompanyName(companyPersonList.get(0).getCompanyName());
+                        inspectDetailVO.setDelegateName(companyPersonList.get(0).getDelegateName());
+                        inspectDetailVO.setDelegatePhone(companyPersonList.get(0).getDelegatePhone());
+                        inspectDetailVO.setFireDutyName(companyPersonList.get(0).getFireDutyName());
+                        inspectDetailVO.setFireDutyPhone(companyPersonList.get(0).getFireDutyPhone());
+                        inspectDetailVO.setFireManageName(companyPersonList.get(0).getFireManageName());
+                        inspectDetailVO.setFireManagePhone(companyPersonList.get(0).getFireManagePhone());
+                    }
                     inspectDetailVO.setHandlingStatus(page.getRecords().get(k).getHandlingStatus());
                     inspectDetailVO.setInspectTime(page.getRecords().get(k).getCreateTime());
                     list.add(inspectDetailVO);