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

@@ -38,7 +38,7 @@ public class DangerInspectionRecordServiceImpl extends ServiceImpl<DangerInspect
 
 
     /**
-     * 根据分线点编号dangerId，获取最新的巡检记录
+     * 根据风险点编号dangerId，获取最新的巡检记录
      * @param dangerId
      * @return
      */
@@ -88,7 +88,7 @@ public class DangerInspectionRecordServiceImpl extends ServiceImpl<DangerInspect
             queryWrapper.eq(DangerInspectInfo::getDangerId, dangerId);
             List<DangerInspectInfo> dangerInspectInfoList = inspectInfoMapper.selectList( queryWrapper );
 
-            LambdaQueryWrapper<DangerInspectItem> queryItemWrapper = new LambdaQueryWrapper<DangerInspectItem>();
+
             List<DangerInspectItem> inspectItemList =  null;
 
 
@@ -108,6 +108,7 @@ public class DangerInspectionRecordServiceImpl extends ServiceImpl<DangerInspect
                     dangerInspectionInfoMapper.insert(inspectionInfo);
 
                     //搜索检查内容对象，检查项目
+                    LambdaQueryWrapper<DangerInspectItem> queryItemWrapper = new LambdaQueryWrapper<DangerInspectItem>();
                     queryItemWrapper.eq(DangerInspectItem::getInspectObjId, dangerInspectInfo.getId());
                     inspectItemList = inspectItemMapper.selectList(queryItemWrapper);
                     if(inspectItemList != null && !inspectItemList.isEmpty()){
@@ -126,6 +127,8 @@ public class DangerInspectionRecordServiceImpl extends ServiceImpl<DangerInspect
                     }
                 }
             }
+            //添加检查项
+
            // inspectInfoMapper.
 
             //this.baseMapper.batchSaveInspectionInfo(dangerInspection);