|
@@ -563,8 +563,8 @@ public class PatrolInspectionPlanSonServiceImpl extends AbstractCrudService<Patr
|
|
|
}
|
|
|
|
|
|
List<Integer> siteIdList = new ArrayList<>();
|
|
|
- for (int i = 0; i < planSiteSonList.size(); i++) {
|
|
|
- siteIdList.add(planSiteSonList.get(i).getSiteId());
|
|
|
+ for (int k = 0; k < planSiteSonList.size(); k++) {
|
|
|
+ siteIdList.add(planSiteSonList.get(k).getSiteId());
|
|
|
}
|
|
|
LambdaQueryWrapper<PatrolInspectionSite> queryWrapperTwo = Wrappers.lambdaQuery();
|
|
|
queryWrapperTwo.in(PatrolInspectionSite::getId, siteIdList)
|
|
@@ -591,7 +591,7 @@ public class PatrolInspectionPlanSonServiceImpl extends AbstractCrudService<Patr
|
|
|
SiteVo.setTenantId(siteList.get(i).getTenantId());
|
|
|
SiteVo.setCompanyId(siteList.get(i).getCompanyId());
|
|
|
for (int j = 0; j < planSiteSonList.size(); j++) {
|
|
|
- if (siteList.get(i).getId() == planSiteSonList.get(j).getSiteId()) {
|
|
|
+ if (siteList.get(i).getId().equals(planSiteSonList.get(j).getSiteId())) {
|
|
|
SiteVo.setInspectionTime(planSiteSonList.get(j).getCreateTime());
|
|
|
SiteVo.setInspectionStatus(planSiteSonList.get(j).getInspectionStatus());
|
|
|
}
|