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

@@ -76,7 +76,7 @@ public class DangerInspectInfoController {
 		Result<IPage<DangerInspectInfo>> result = new Result<IPage<DangerInspectInfo>>();
 		QueryWrapper<DangerInspectInfo> queryWrapper = QueryGenerator.initQueryWrapper(dangerInspectInfo, req.getParameterMap());
 		Page<DangerInspectInfo> page = new Page<DangerInspectInfo>(pageNo, pageSize);
-		queryWrapper.eq("danger_level_id",dangerInspectInfo.getDangerLevelId());
+		queryWrapper.eq("danger_id",dangerInspectInfo.getDangerId());
 		queryWrapper.orderByDesc("create_time");
 
 		IPage<DangerInspectInfo> pageList = dangerInspectInfoService.page(page, queryWrapper);

+package com.skua.modules.safe.controller.app;
+import java.util.List;
+
+import com.skua.core.api.vo.Result;
+import com.skua.core.aspect.annotation.AutoLog;
+import com.skua.core.context.BaseContextHandler;
+import com.skua.modules.safe.entity.*;
+import com.skua.modules.safe.mapper.DangerInspectionItemMapper;
+import com.skua.modules.safe.service.*;
+import lombok.extern.slf4j.Slf4j;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+/**
+ * <pre>
+ * 风险巡检
+ * </pre>
+ * @author 开发者姓名
+ * @version V0.1, 开发时间
+ */
+@Slf4j
+@Api(tags="风险巡检")
+@RestController("APPDangerInspectionController")
+@RequestMapping("/app/safe/dangerInspection")
+public class APPDangerInspectionController {
+
+    @Autowired
+    private IDangerLevelManageService dangerLevelManageService;//风险点Service
+
+    @Autowired
+    private IDangerInspectionRecordService inspectionRecordService ;//巡检对象
+
+    @Autowired
+    private IDangerInspectionInfoService  inspectionInfoService ;//巡检对象
+
+    @Autowired
+    private IDangerInspectionItemService  inspectionItemService ;//巡检对象，检查项
+
+
+    /**
+     * <pre>
+     * 	 扫描二维码进入：风险点详情
+     * </pre>
+     * @param id
+     * @return
+     * @author 开发者姓名, 开发时间
+     * @Description: TODO(这里描述这个方法的需求变更情况)
+     */
+    @AutoLog(value = "扫描二维码进入：风险点详情")
+    @ApiOperation(value="扫描二维码进入：风险点详情", notes="扫描二维码进入：风险点详情")
+    @GetMapping(value = "/queryDangerById")
+    public Result<DangerLevelManage> queryById(@RequestParam(name="id",required=true) String id) {
+        Result<DangerLevelManage> result = new Result<DangerLevelManage>();
+        DangerLevelManage dangerInspection = dangerLevelManageService.getById(id);
+        //查询：上次巡检时间
+        DangerInspectionRecord inspection  = inspectionRecordService.queryOneByDangerId( id,"2" ,BaseContextHandler.getUserId());//根据分线点编号，获取巡检最后一条记录
+        if(inspection != null ){
+            dangerInspection.setLastInspectionTime( inspection.getReportDate() );
+        }else{
+            dangerInspection.setLastInspectionTime("");
+        }
+        if(dangerInspection==null) {
+            result.error500("未找到对应实体");
+        }else {
+            result.setResult(dangerInspection);
+            result.setSuccess(true);
+        }
+        return result;
+    }
+
+    /**
+     * <pre>
+     * 	 开始巡检-->获取风险点，检查对象集合
+     * </pre>
+     * @param dangerId
+     * @return
+     * @author 开发者姓名, 开发时间
+     * @Description: TODO(这里描述这个方法的需求变更情况)
+     */
+    @AutoLog(value = "开始巡检-->开始巡检")
+    @ApiOperation(value="开始巡检-->开始巡检", notes="开始巡检-->开始巡检")
+    @GetMapping(value = "/startInspection")
+    public Result< DangerInspectionRecord > startInspection(@RequestParam(name="dangerId",required=true) String dangerId) {
+        Result< DangerInspectionRecord > result = new Result< DangerInspectionRecord >();
+
+        //开始巡检，将风险点下的检查内容（检查项目）插入到巡检、巡检项目，并创建巡检记录
+        DangerInspectionRecord dangerInspection  =   inspectionRecordService.startInspection(dangerId,"1",BaseContextHandler.getUserId());
+        if(dangerInspection==null) {
+            result.error500("未找到对应实体");
+        }else {
+            result.setResult(dangerInspection);
+            result.setSuccess(true);
+        }
+        return result;
+    }
+
+    /**
+     * <pre>
+     * 	 开始巡检-->根据id获取检查内容对象
+     * </pre>
+     * @param id
+     * @return
+     * @author 开发者姓名, 开发时间
+     * @Description: TODO(这里描述这个方法的需求变更情况)
+     */
+    @AutoLog(value = "开始巡检-->根据id获取检查内容对象")
+    @ApiOperation(value="开始巡检-->根据id获取检查内容对象", notes="开始巡检-->根据id获取检查内容对象")
+    @GetMapping(value = "/queryInspectInfoById")
+    public Result< DangerInspectionInfo> queryInspectInfoById(@RequestParam(name="id",required=true) String id) {
+        Result< DangerInspectionInfo> result = new Result< DangerInspectionInfo >();
+
+        DangerInspectionInfo   inspectionInfo  = inspectionInfoService.getById( id ) ;
+        if(inspectionInfo != null ){
+            List<DangerInspectionItem>  inspectionItemList = inspectionItemService.queryListByInfoId(inspectionInfo.getId());
+            inspectionInfo.setInspectionItemList( inspectionItemList ) ;
+        }
+
+        if(inspectionInfo==null) {
+            result.error500("未找到对应实体");
+        }else {
+            result.setResult(inspectionInfo);
+            result.setSuccess(true);
+        }
+        return result;
+    }
+
+    @AutoLog(value = "巡查内容对象-保存")
+    @ApiOperation(value="巡查内容对象-保存", notes="巡查内容对象-保存")
+    @PostMapping(value = "/saveInspectionInf")
+    public Result<DangerInspectInfo> updateDangerInspectionInfo(@RequestBody DangerInspectionInfo dangerInspectionInfo) {
+        Result<DangerInspectInfo> result = new Result<DangerInspectInfo>();
+        try {
+            inspectionInfoService.updateDangerInspectionInfo(dangerInspectionInfo);
+            result.success("添加成功！");
+        } catch (Exception e) {
+            log.error(e.getMessage(),e);
+            result.error500("操作失败");
+        }
+        return result;
+    }
+    @AutoLog(value = "结束巡检")
+    @ApiOperation(value="结束巡检", notes="结束巡检")
+    @PostMapping(value = "/endInspection")
+    public Result<DangerInspectInfo> endInspection(@RequestParam(name="id",required=true) String id) {
+        Result<DangerInspectInfo> result = new Result<DangerInspectInfo>();
+        try {
+
+            //inspectionRecordService.(id);
+            result.success("添加成功！");
+        } catch (Exception e) {
+            log.error(e.getMessage(),e);
+            result.error500("操作失败");
+        }
+        return result;
+    }
+
+
+}

@@ -34,7 +34,7 @@ public class DangerInspectInfo {
 	/**风险点编号*/
 	@Excel(name = "风险点编号", width = 15)
     @ApiModelProperty(value = "风险点编号")
-	private String dangerLevelId;
+	private String dangerId;
 	/**检查内容*/
 	@Excel(name = "检查内容", width = 15)
     @ApiModelProperty(value = "检查内容")

@@ -29,6 +29,12 @@ public class DangerInspectItem {
 	@TableId(type = IdType.ID_WORKER_STR)
     @ApiModelProperty(value = "id")
 	private String id;
+
+	/**风险点编号*/
+	@Excel(name = "风险点编号", width = 15)
+	@ApiModelProperty(value = "风险点编号")
+	private String dangerId;
+
 	/**检查内容对象编号*/
 	@Excel(name = "检查内容对象编号", width = 15)
     @ApiModelProperty(value = "检查内容对象编号")

+package com.skua.modules.safe.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+
+/**
+ * 巡检对象
+ */
+@Data
+@TableName("danger_inspection_info")
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="danger_inspection_info对象", description="巡检对象")
+public class DangerInspectionInfo {
+    
+	/**id*/
+	@TableId(type = IdType.ID_WORKER_STR)
+    @ApiModelProperty(value = "id")
+	private String id;
+	/**厂id*/
+	@Excel(name = "厂id", width = 15)
+    @ApiModelProperty(value = "厂id")
+	private String departId;
+	/**记录人用户编号*/
+	@Excel(name = "巡检记录编号", width = 15)
+    @ApiModelProperty(value = "巡检记录编号")
+	private String inspectionRecordId;
+	/**风险等级对象*/
+	@Excel(name = "风险等级对象", width = 15)
+    @ApiModelProperty(value = "风险等级对象")
+	private String dangerId;
+	/**检查内容对象编号*/
+	@Excel(name = "检查内容对象编号", width = 15)
+    @ApiModelProperty(value = "检查内容对象编号")
+	private String inspectObjId;
+
+	/**检查内容*/
+	@Excel(name = "检查内容", width = 15)
+	@ApiModelProperty(value = "检查内容")
+	private String inspectName;
+	/**检查标准*/
+	@Excel(name = "检查标准", width = 15)
+	@ApiModelProperty(value = "检查标准")
+	private String inspectStandard;
+	/**检查方法*/
+	@Excel(name = "检查方法", width = 15)
+	@ApiModelProperty(value = "检查方法")
+	private String inspectMethod;
+
+
+	/**检查图片*/
+	@Excel(name = "检查图片", width = 15)
+    @ApiModelProperty(value = "检查图片")
+	private String inspectImg;
+	/**上报人（用户id）*/
+	@Excel(name = "上报人（用户id）", width = 15)
+    @ApiModelProperty(value = "上报人（用户id）")
+	private String reportUser;
+	/**巡检状态(0:未开始，1:开始，2:结束，3：作废)*/
+	@Excel(name = "巡检状态(0:未开始，1:开始，2:结束，3：作废)", width = 15)
+    @ApiModelProperty(value = "巡检状态(0:未开始，1:开始，2:结束，3：作废)")
+	private String status;
+	/**备注*/
+	@Excel(name = "备注", width = 15)
+    @ApiModelProperty(value = "备注")
+	private String remark;
+	/**创建人Id*/
+	@Excel(name = "创建人Id", width = 15)
+    @ApiModelProperty(value = "创建人Id")
+	private String createBy;
+	/**上报时间*/
+	@Excel(name = "上报时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "上报时间")
+	private Date createTime;
+	/**修改人Id*/
+	@Excel(name = "修改人Id", width = 15)
+    @ApiModelProperty(value = "修改人Id")
+	private String updateBy;
+	/**修改时间*/
+	@Excel(name = "修改时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "修改时间")
+	private Date updateTime;
+	/**删除标识，1有效，0删除*/
+	@Excel(name = "删除标识，1有效，0删除", width = 15)
+    @ApiModelProperty(value = "删除标识，1有效，0删除")
+	private Integer delFlag;
+
+	@TableField(exist=false)
+	@ApiModelProperty(value = "检查项集合")
+	private  List<DangerInspectionItem> inspectionItemList;
+}

@@ -29,6 +29,11 @@ public class DangerInspectionItem {
 	@TableId(type = IdType.ID_WORKER_STR)
     @ApiModelProperty(value = "id")
 	private String id;
+
+	@Excel(name = "巡检检查内容对象编号", width = 15)
+	@ApiModelProperty(value = "巡检检查内容对象编号")
+	private String inspectionInfoId;
+
 	/**检查内容对象编号*/
 	@Excel(name = "检查内容对象编号", width = 15)
     @ApiModelProperty(value = "检查内容对象编号")

@@ -102,7 +102,6 @@ public class DangerLevelManage {
 	private String qrCode;
 
 
-
 	/**创建人Id*/
     @ApiModelProperty(value = "创建人Id")
 	private String createBy;

+package com.skua.modules.safe.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import com.skua.modules.safe.entity.DangerInspectionInfo;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * 巡检对象
+ */
+public interface DangerInspectionInfoMapper extends BaseMapper<DangerInspectionInfo> {
+
+}

+package com.skua.modules.safe.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import com.skua.modules.safe.entity.DangerInspectionRecord;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * 巡检记录
+ */
+public interface DangerInspectionRecordMapper extends BaseMapper<DangerInspectionRecord> {
+
+    /***
+     * 批量插入检查内容对象
+     * @param dangerInspection
+     */
+    public void batchSaveInspectionInfo(DangerInspectionRecord dangerInspection);
+}

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.skua.modules.safe.mapper.DangerInspectionInfoMapper">
+
+</mapper>
\ No newline at end of file

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.skua.modules.safe.mapper.DangerInspectionRecordMapper">
+
+</mapper>
\ No newline at end of file

+package com.skua.modules.safe.service;
+
+import com.skua.modules.safe.entity.DangerInspectionInfo;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * 巡检对象
+ */
+public interface IDangerInspectionInfoService extends IService<DangerInspectionInfo> {
+
+    /***
+     * 保存巡检对象
+     * @param dangerInspectionInfo
+     */
+    public void updateDangerInspectionInfo(DangerInspectionInfo dangerInspectionInfo);
+}

@@ -3,9 +3,17 @@ package com.skua.modules.safe.service;
 import com.skua.modules.safe.entity.DangerInspectionItem;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.List;
+
 /**
  * 风险检查项记录
  */
 public interface IDangerInspectionItemService extends IService<DangerInspectionItem> {
 
+    /***
+     *  根据infoId查询检查项目集合
+     * @param infoId
+     * @return
+     */
+    public  List<DangerInspectionItem> queryListByInfoId(String infoId);
 }

+package com.skua.modules.safe.service;
+
+import com.skua.modules.safe.entity.DangerInspectionInfo;
+import com.skua.modules.safe.entity.DangerInspectionRecord;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
+
+/**
+ * 巡检记录
+ */
+public interface IDangerInspectionRecordService extends IService<DangerInspectionRecord> {
+
+    /**
+     * 根据分线点编号dangerId，获取最新的巡检记录
+     * @param dangerId
+     * @return
+     */
+    public DangerInspectionRecord queryOneByDangerId(String dangerId,String status,String userId);
+
+    /***
+     * 开始i巡检，如果用户已经开始巡检，返回巡检对象，如果未巡检，那就创建新的巡检对象
+     * @param dangerId  风险点编号
+     * @param status  状态
+     * @param userId   用户编号
+     * @return
+     */
+    public DangerInspectionRecord startInspection(String dangerId, String status , String userId);
+}

@@ -54,7 +54,7 @@ public class DangerInspectInfoServiceImpl extends ServiceImpl<DangerInspectInfoM
      */
     public List<DangerInspectInfo> queryListByDangerId(String  dangerId){
         LambdaQueryWrapper<DangerInspectInfo> queryWrapper = new LambdaQueryWrapper<DangerInspectInfo>();
-        queryWrapper.eq(DangerInspectInfo::getDangerLevelId, dangerId);
+        queryWrapper.eq(DangerInspectInfo::getDangerId, dangerId);
         queryWrapper.orderByDesc(DangerInspectInfo::getCreateTime);//添加排序
         return this.baseMapper.selectList(queryWrapper);
     }

+package com.skua.modules.safe.service.impl;
+
+import com.skua.modules.safe.entity.DangerInspectionInfo;
+import com.skua.modules.safe.entity.DangerInspectionItem;
+import com.skua.modules.safe.mapper.DangerInspectionInfoMapper;
+import com.skua.modules.safe.mapper.DangerInspectionItemMapper;
+import com.skua.modules.safe.service.IDangerInspectionInfoService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+
+/**
+ * 巡检对象
+ */
+@Service
+public class DangerInspectionInfoServiceImpl extends ServiceImpl<DangerInspectionInfoMapper, DangerInspectionInfo> implements IDangerInspectionInfoService {
+
+    @Resource
+    private DangerInspectionItemMapper   inspectionItemMapper ;
+    /***
+     * 保存巡检对象
+     * @param dangerInspectionInfo
+     */
+    @Transactional
+    public void updateDangerInspectionInfo(DangerInspectionInfo dangerInspectionInfo){
+
+        this.baseMapper.updateById(dangerInspectionInfo ) ;
+
+        if(dangerInspectionInfo.getInspectionItemList() != null && !dangerInspectionInfo.getInspectionItemList().isEmpty()){
+            for( DangerInspectionItem item  : dangerInspectionInfo.getInspectionItemList()){
+                inspectionItemMapper.updateById( item) ;
+            }
+        }
+    }
+}

 package com.skua.modules.safe.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.skua.modules.safe.entity.DangerInspectInfo;
 import com.skua.modules.safe.entity.DangerInspectionItem;
 import com.skua.modules.safe.mapper.DangerInspectionItemMapper;
 import com.skua.modules.safe.service.IDangerInspectionItemService;
@@ -7,10 +9,24 @@ import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
+import java.util.List;
+
 /**
  * 风险检查项记录
  */
 @Service
 public class DangerInspectionItemServiceImpl extends ServiceImpl<DangerInspectionItemMapper, DangerInspectionItem> implements IDangerInspectionItemService {
 
+    /***
+     *  根据infoId查询检查项目集合
+     * @param infoId
+     * @return
+     */
+    public List<DangerInspectionItem> queryListByInfoId(String infoId){
+        LambdaQueryWrapper<DangerInspectionItem> queryWrapper = new LambdaQueryWrapper<DangerInspectionItem>();
+        queryWrapper.eq(DangerInspectionItem::getInspectionInfoId, infoId);
+        queryWrapper.orderByDesc(DangerInspectionItem::getCreateTime);//添加排序
+
+        return this.baseMapper.selectList(queryWrapper  );
+    }
 }

+package com.skua.modules.safe.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.skua.core.context.BaseContextHandler;
+import com.skua.modules.safe.entity.*;
+import com.skua.modules.safe.mapper.*;
+import com.skua.modules.safe.service.IDangerInspectionRecordService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 巡检记录
+ */
+@Service
+public class DangerInspectionRecordServiceImpl extends ServiceImpl<DangerInspectionRecordMapper, DangerInspectionRecord> implements IDangerInspectionRecordService {
+
+    @Resource
+    private DangerLevelManageMapper dangerLevelManageMapper;
+    @Resource
+    private DangerInspectionInfoMapper dangerInspectionInfoMapper ;//巡检对象
+    @Resource
+    private DangerInspectionItemMapper dangerInspectionItemMapper ;//巡检对象，检查项
+    @Resource
+    private DangerInspectInfoMapper inspectInfoMapper;//检查对象
+    @Resource
+    private DangerInspectItemMapper  inspectItemMapper;//检查选项
+
+
+    /**
+     * 根据分线点编号dangerId，获取最新的巡检记录
+     * @param dangerId
+     * @return
+     */
+    public DangerInspectionRecord queryOneByDangerId(String dangerId,String status,String userId){
+        LambdaQueryWrapper<DangerInspectionRecord> queryWrapper = new LambdaQueryWrapper<DangerInspectionRecord>();
+        queryWrapper.eq(DangerInspectionRecord::getDangerId, dangerId);
+        queryWrapper.eq(DangerInspectionRecord::getStatus  , status);
+        queryWrapper.eq(DangerInspectionRecord::getReportUser  , userId);
+        queryWrapper.orderByDesc(DangerInspectionRecord::getCreateTime);//添加排序
+        return this.baseMapper.selectOne(queryWrapper);
+    }
+
+    /***
+     * 开始i巡检，如果用户已经开始巡检，返回巡检对象，如果未巡检，那就创建新的巡检对象
+     * @param dangerId  风险点编号
+     * @param status  状态
+     * @param userId   用户编号
+     * @return
+     */
+    @Transactional
+    public  DangerInspectionRecord startInspection(String dangerId,String status , String userId){
+
+        DangerInspectionRecord   dangerInspection =  queryOneByDangerId(dangerId  ,status  ,userId );
+        if(dangerInspection == null ){
+            DangerLevelManage  dangerLevelManage =  dangerLevelManageMapper.selectById(dangerId );
+            dangerInspection = new  DangerInspectionRecord();
+            dangerInspection.setDepartId(dangerLevelManage.getDepartId());
+            dangerInspection.setDangerId( dangerId  );
+            dangerInspection.setStatus( status);
+            dangerInspection.setReportUser( userId );
+
+            this.baseMapper.insert( dangerInspection ) ;
+
+            //添加检查对象
+            //批量插入检查内容对象
+            LambdaQueryWrapper<DangerInspectInfo> queryWrapper = new LambdaQueryWrapper<DangerInspectInfo>();
+            queryWrapper.eq(DangerInspectInfo::getDangerId, dangerId);
+            List<DangerInspectInfo> dangerInspectInfoList = inspectInfoMapper.selectList( queryWrapper );
+
+            LambdaQueryWrapper<DangerInspectItem> queryItemWrapper = new LambdaQueryWrapper<DangerInspectItem>();
+            List<DangerInspectItem> inspectItemList =  null;
+
+
+            if(dangerInspectInfoList != null && !dangerInspectInfoList.isEmpty()){
+                DangerInspectionInfo  inspectionInfo = null;
+                for(DangerInspectInfo dangerInspectInfo : dangerInspectInfoList){
+                    inspectionInfo = new DangerInspectionInfo();
+                    // ( depart_id , user_id,  danger_id ,    inspect_obj_id,inspect_name,inspect_standard  , inspect_method,report_user, )
+                    inspectionInfo.setDepartId(dangerLevelManage.getDepartId() ) ;
+                    inspectionInfo.setInspectionRecordId( dangerInspection.getId());
+                    inspectionInfo.setDangerId( dangerInspectInfo.getDangerId() );
+                    inspectionInfo.setInspectName( dangerInspectInfo.getInspectName() );
+                    inspectionInfo.setInspectMethod(   dangerInspectInfo.getInspectMethod());
+                    inspectionInfo.setInspectStandard( dangerInspectInfo.getInspectStandard() );
+                    inspectionInfo.setReportUser( userId) ;
+                    dangerInspectionInfoMapper.insert(inspectionInfo);
+
+                    //搜索检查内容对象，检查项目
+                    queryItemWrapper.eq(DangerInspectItem::getInspectObjId, dangerInspectInfo.getId());
+                    inspectItemList = inspectItemMapper.selectList(queryItemWrapper);
+                    if(inspectItemList != null && !inspectItemList.isEmpty()){
+                        DangerInspectionItem  inspectionItem = null;
+
+                        for(DangerInspectItem inspectItem : inspectItemList){
+                            inspectionItem = new DangerInspectionItem();
+                            // ( depart_id , user_id,  danger_id ,    inspect_obj_id,inspect_name,inspect_standard  , inspect_method,report_user, )
+                            inspectionItem.setInspectObjId( inspectItem.getInspectObjId() ) ;
+                            inspectionItem.setItemName( inspectItem.getItemName());
+                            inspectionItem.setItemType( inspectItem.getItemType());
+                            inspectionItem.setInspectionInfoId (inspectionInfo.getId());
+                            dangerInspectionItemMapper.insert(inspectionItem);
+                        }
+                    }
+                }
+            }
+           // inspectInfoMapper.
+
+            //this.baseMapper.batchSaveInspectionInfo(dangerInspection);
+            // 批量插入检查选项集合
+            //this.baseMapper.batchSaveInspectionItem(dangerInspection);
+   /*         LambdaQueryWrapper<DangerInspectItem> queryItemWrapper = new LambdaQueryWrapper<DangerInspectItem>();
+            queryItemWrapper.eq(DangerInspectItem::getDangerId, dangerId);
+            List<DangerInspectItem> inspectItemList = inspectItemMapper.selectList(queryItemWrapper);
+            if(inspectItemList != null && !inspectItemList.isEmpty()){
+                DangerInspectionItem  inspectionItem = null;
+
+                for(DangerInspectItem inspectItem : inspectItemList){
+                    inspectionItem = new DangerInspectionItem();
+                    // ( depart_id , user_id,  danger_id ,    inspect_obj_id,inspect_name,inspect_standard  , inspect_method,report_user, )
+                    inspectionItem.setInspectObjId( inspectItem.getInspectObjId() ) ;
+                    inspectionItem.setItemName( inspectItem.getItemName());
+                    inspectionItem.setItemType( inspectItem.getItemType());
+                    inspectionItem.setUserId(userId);
+                    dangerInspectionItemMapper.insert(inspectionItem);
+                }
+            }*/
+            // 添加检查对象的检查项目
+        }
+
+        List<DangerInspectionInfo>  inspectionInfoList   = queryInspectionInfoByDangerId( dangerId ,userId);
+        dangerInspection.setInspectionInfoList( inspectionInfoList  ) ;
+        return dangerInspection;
+    }
+
+    /***
+     * 根据检查点编号，获取用户的巡检检查集合
+     * @param dangerId
+     * @param userId
+     * @return
+     */
+    public List<DangerInspectionInfo> queryInspectionInfoByDangerId(String dangerId ,String userId){
+        LambdaQueryWrapper<DangerInspectionInfo> queryWrapper = new LambdaQueryWrapper<DangerInspectionInfo>();
+        queryWrapper.eq(DangerInspectionInfo::getReportUser, userId);
+        queryWrapper.eq(DangerInspectionInfo::getDangerId, dangerId);
+        queryWrapper.orderByAsc(  DangerInspectionInfo::getCreateTime );
+        List<DangerInspectionInfo>   inspectionInfoList = dangerInspectionInfoMapper.selectList( queryWrapper) ;
+
+        return inspectionInfoList;
+    }
+}