移动端-巡检计划列表查询

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

@@ -163,7 +163,7 @@ public class PatrolInspectionPlanSonServiceImpl extends AbstractCrudService<Patr
                     for (int j = 0; j < planSiteSonList.size(); j++) {
                         int id = planSonList.get(i).getId();
                         int planId = planSiteSonList.get(j).getPlanId();
-                            if (id == planId) {
+                        if (id == planId) {
                             planSonList.get(i).setSiteId(siteList.get(0).getId());
                             list.add(planSonList.get(i));
                         }
@@ -378,7 +378,7 @@ public class PatrolInspectionPlanSonServiceImpl extends AbstractCrudService<Patr
     }
 
     @Override
-    public List<PatrolInspectionRecordVo> recordList(String currentDate, String sort, Integer id,Integer planSonId,Integer siteId) {
+    public List<PatrolInspectionRecordVo> recordList(String currentDate, String sort, Integer id, Integer planSonId, Integer siteId) {
         List<Integer> personnelIdList = this.getpersonId();
         LambdaQueryWrapper<PatrolInspectionPlanSchedule> queryWrapper = Wrappers.lambdaQuery();
         queryWrapper.select(PatrolInspectionPlanSchedule::getPlanId)
@@ -526,7 +526,7 @@ public class PatrolInspectionPlanSonServiceImpl extends AbstractCrudService<Patr
                             contentOptionVo.setSelectStatus(true);
                             contentOptionVo.setRemarks(recordOptionList.get(j).getRemarks());
                         }
-                        if (contentOptionList.get(i).getContentId()==recordOptionList.get(j).getContentId()){
+                        if (contentOptionList.get(i).getContentId() == recordOptionList.get(j).getContentId()) {
                             contentOptionVo.setContent(recordOptionList.get(i).getContent());
                         }
                     }
@@ -757,7 +757,9 @@ public class PatrolInspectionPlanSonServiceImpl extends AbstractCrudService<Patr
                     }
                 }
                 for (int j = 0; j < undetectedSiteCountList.size(); j++) {
-                    if (planSonList.get(i).getId() == undetectedSiteCountList.get(j).getId()) {
+                    int id = planSonList.get(i).getId();
+                    int id1 = undetectedSiteCountList.get(j).getId();
+                    if (id == id1) {
                         patrolInspectionPlanSonVo.setUndetectedSiteCount(undetectedSiteCountList.get(j).getListCount());
                     }
                 }