kangwei ： 风险巡检、

           在线考试相关接口

+package com.skua.modules.edu.controller;
+
+import io.swagger.annotations.Api;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 功能描述：在线考试
+ * @auther kangwei
+ * @create 2024-09-20-14:49
+ */
+@Slf4j
+@Api(tags="在线考试-在线考试")
+@RestController("examController")
+@RequestMapping("/web/edu/exam")
+public class ExamController {
+
+    //在线考试列表
+
+    // 根据试卷获取试题
+
+    // 在线答题
+
+
+    // 保存答题卡，并计算成绩
+
+
+}

@@ -136,13 +136,13 @@ public class PaperController {
 	@AutoLog(value = "在线考试-发布试卷")
 	@ApiOperation(value="在线考试-发布试卷", notes="在线考试-发布试卷")
 	@GetMapping(value = "/publish")
-	public Result<Paper> publish(@RequestParam(name="id",required=true) String id) {
+	public Result<Paper> publish(@RequestParam(name="id",required=true) String id,@RequestParam(name="sendStatus",required=true) String sendStatus) {
 		Result<Paper> result = new Result<Paper>();
 		Paper paper = paperService.getById(id);
 		if(paper==null) {
 			result.error500("未找到对应实体");
 		}else {
-			paper.setSendStatus("1");
+			paper.setSendStatus(sendStatus);
 			paper.setSendTime( new Date());
 			boolean ok = paperService.updateById(paper);
 			//TODO 返回false说明什么？
@@ -208,13 +208,13 @@ public class PaperController {
 	@AutoLog(value = "在线考试-试卷-通过id查询")
 	@ApiOperation(value="在线考试-试卷-通过id查询", notes="在线考试-试卷-通过id查询")
 	@GetMapping(value = "/queryById")
-	public Result<Paper> queryById(@RequestParam(name="id",required=true) String id) {
-		Result<Paper> result = new Result<Paper>();
-		Paper paper = paperService.getById(id);
-		if(paper==null) {
+	public Result<PaperVO> queryById(@RequestParam(name="id",required=true) String id) {
+		Result<PaperVO> result = new Result<PaperVO>();
+        PaperVO paperVO = paperService.queryById(id);
+		if(paperVO==null) {
 			result.error500("未找到对应实体");
 		}else {
-			result.setResult(paper);
+			result.setResult(paperVO);
 			result.setSuccess(true);
 		}
 		return result;

@@ -11,4 +11,10 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface QuestionMapper extends BaseMapper<Question> {
 
+    /***
+     * 根据试卷编号获取试题集合
+     * @param paperId
+     * @return
+     */
+    public  List<Question> selectListByPaperId(@Param("paperId") String paperId);
 }

@@ -2,4 +2,11 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.skua.modules.edu.mapper.QuestionMapper">
 
+    <!--  根据试卷编号获取试题集合-->
+    <select id="selectListByPaperId" resultType="com.skua.modules.edu.entity.Question">
+        select q.* ,pq.score from  edu_paper_question  pq
+        left join edu_question q on  q.id = pq.question_id
+        where pq.paper_id = #{paperId}
+        order by pq.sort asc
+    </select>
 </mapper>
\ No newline at end of file

@@ -3,6 +3,7 @@ package com.skua.modules.edu.service;
 import com.skua.modules.edu.entity.Paper;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.skua.modules.edu.vo.PaperVO;
+import org.bouncycastle.eac.jcajce.JcaPublicKeyConverter;
 
 import javax.transaction.Transactional;
 
@@ -26,4 +27,10 @@ public interface IPaperService extends IService<Paper> {
      */
     public boolean updatePaper(PaperVO paperVO) throws Exception ;
 
+    /***
+     * 根据试卷编号获取试卷以及试题集合
+     * @param id
+     * @return
+     */
+    public  PaperVO queryById(String id);
 }

 package com.skua.modules.edu.service.impl;
 
+import com.google.gson.Gson;
+import com.google.gson.reflect.TypeToken;
 import com.skua.modules.edu.entity.Paper;
 import com.skua.modules.edu.entity.PaperQuestion;
 import com.skua.modules.edu.entity.Question;
+import com.skua.modules.edu.entity.QuestionOption;
 import com.skua.modules.edu.mapper.PaperMapper;
 import com.skua.modules.edu.mapper.PaperQuestionMapper;
+import com.skua.modules.edu.mapper.QuestionMapper;
 import com.skua.modules.edu.service.IPaperService;
 import com.skua.modules.edu.vo.PaperVO;
-import org.apache.commons.beanutils.BeanUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.boot.json.GsonJsonParser;
 import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
 import javax.annotation.Resource;
 import javax.transaction.Transactional;
+import java.lang.reflect.Type;
+import java.util.List;
 
 /**
  * 在线考试-试卷
@@ -23,6 +30,9 @@ public class PaperServiceImpl extends ServiceImpl<PaperMapper, Paper> implements
 
     @Resource
     private PaperQuestionMapper paperQuestionMapper ;
+
+    @Resource
+    private QuestionMapper questionMapper ;
     /***
      * 添加试卷、试卷试题表
      * @param paperVO
@@ -32,17 +42,13 @@ public class PaperServiceImpl extends ServiceImpl<PaperMapper, Paper> implements
     public  int savePaper(PaperVO paperVO)throws Exception{
 
         // 步骤1 保存试卷表
-        Paper paper = new Paper();
-        //将questionVO的属性 赋值给  question
-        BeanUtils.copyProperties(paperVO, paperVO);
-        int count = this.baseMapper.insert( paper  );
+        int count = this.baseMapper.insert( paperVO  );
 
         // 步骤2：批量插入试题选项集合
         PaperQuestion paperQuestion = null;
         int index = 1;
         if(paperVO.getQuestionList() != null ){
             for(Question question :paperVO.getQuestionList() ){
-                //(  String paperId, String questionId, String score, Integer sort  )
                 paperQuestion = new PaperQuestion( paperVO.getId(),question.getId(),question.getScore(),  index);
                 paperQuestionMapper.insert(  paperQuestion  ) ;
             }
@@ -59,10 +65,8 @@ public class PaperServiceImpl extends ServiceImpl<PaperMapper, Paper> implements
     public boolean updatePaper(PaperVO paperVO) throws Exception {
 
         // 步骤1 保存试卷表
-        Paper paper = new Paper();
-        //将questionVO的属性 赋值给  question
-        BeanUtils.copyProperties(paperVO, paperVO);
-        int count = this.baseMapper.updateById( paper  );
+
+        int count = this.baseMapper.updateById( paperVO  );
 
         //步骤2 根据试卷编号，删除试卷试题表记录
         paperQuestionMapper.delByPaperId( paperVO.getId() );
@@ -73,12 +77,38 @@ public class PaperServiceImpl extends ServiceImpl<PaperMapper, Paper> implements
         if(paperVO.getQuestionList() != null ){
             for(Question question :paperVO.getQuestionList() ){
                 //(  String paperId, String questionId, String score, Integer sort  )
-                paperQuestion = new PaperQuestion( paperVO.getId(),question.getId(),question.getScore(),  index);
+                paperQuestion = new PaperQuestion( paperVO.getId(),question.getId(),question.getScore(),  index++);
                 paperQuestionMapper.insert(  paperQuestion  ) ;
             }
         }
         return true;
     }
 
+    /***
+     * 根据试卷编号获取试卷以及试题集合
+     * @param id
+     * @return
+     */
+    public  PaperVO queryById(String id){
+        Paper  paper =  this.baseMapper.selectById(id);
+        PaperVO paperVO = new  PaperVO();//
+        if( paper != null ){
+            BeanUtils.copyProperties(paper, paperVO);
+           List<Question> questionList =  questionMapper.selectListByPaperId(id);
+           List<QuestionOption> optionList = null;
+           if(questionList != null && !questionList.isEmpty()){
+               // 创建Gson实例
+               Gson gson = new Gson();
+               Type questionTypeListType = new TypeToken<List<QuestionOption>>() {}.getType();
+               for( Question question : questionList){
+                   optionList = gson.fromJson(question.getQuestionData(),questionTypeListType);
+                   question.setOptionList(optionList  );
+               }
+           }
+            paperVO.setQuestionList(questionList);
+        }
+        return paperVO;
+    }
+
 
 }

@@ -8,6 +8,7 @@ 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 com.skua.modules.edu.entity.Paper;
 import com.skua.modules.edu.entity.Question;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -23,75 +24,7 @@ import org.jeecgframework.poi.excel.annotation.Excel;
  */
 @Data
 @ApiModel(value="edu_paper数据传输对象", description="在线考试-试卷")
-public class PaperVO {
-    
-	/**主键*/
-    @ApiModelProperty(value = "主键")
-	private String id;
-	/**部门编号*/
-	@Excel(name = "部门编号", width = 15)
-    @ApiModelProperty(value = "部门编号")
-	private String departId;
-	/**试卷标题*/
-	@Excel(name = "试卷标题", width = 15)
-    @ApiModelProperty(value = "试卷标题")
-	private String paperTitle;
-	/**参加考试厂id*/
-	@Excel(name = "参加考试厂id", width = 15)
-    @ApiModelProperty(value = "参加考试厂id")
-	private String examDepartId;
-	/**参加考试用户集合*/
-	@Excel(name = "参加考试用户集合", width = 15)
-    @ApiModelProperty(value = "参加考试用户集合")
-	private String examUserIds;
-	/**状态（1启用 0不启用）*/
-	@Excel(name = "状态（1启用 0不启用）", width = 15)
-    @ApiModelProperty(value = "状态（1启用 0不启用）")
-	private String status;
-	/**考试开始时间*/
-	@Excel(name = "考试开始时间", width = 15)
-    @ApiModelProperty(value = "考试开始时间")
-	private String startTime;
-	/**考试结束时间*/
-	@Excel(name = "考试结束时间", width = 15)
-    @ApiModelProperty(value = "考试结束时间")
-	private String endTime;
-	/**总分数*/
-	@Excel(name = "总分数", width = 15)
-    @ApiModelProperty(value = "总分数")
-	private String totalScore;
-	/**及格分数*/
-	@Excel(name = "及格分数", width = 15)
-    @ApiModelProperty(value = "及格分数")
-	private String passScore;
-	/**发布状态（0未发布，1已发布，2已撤销）*/
-	@Excel(name = "发布状态（0未发布，1已发布，2已撤销）", width = 15)
-    @ApiModelProperty(value = "发布状态（0未发布，1已发布，2已撤销）")
-	private String sendStatus;
-	/**发布时间*/
-	@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 sendTime;
-	/**撤销时间*/
-	@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 cancelTime;
-	/**试卷类型:1 公开  2 私有*/
-	@Excel(name = "试卷类型:1 公开  2 私有", width = 15)
-    @ApiModelProperty(value = "试卷类型:1 公开  2 私有")
-	private String paperType;
-	/**备注*/
-	@Excel(name = "备注", width = 15)
-    @ApiModelProperty(value = "备注")
-	private String remark;
-
-
+public class PaperVO  extends Paper {
 	@ApiModelProperty(value = "试卷试题集合")
 	private List<Question> questionList;
-
-
 }

@@ -229,7 +229,6 @@ public class PurchasePlanController {
 		}
 		return result;
 	}
-
 	/**
 	 * <pre>
 	 * 	 通过id查询

@@ -21,6 +21,7 @@ import java.util.Date;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.skua.modules.safe.vo.DangerLevelManageVO;
 import lombok.extern.slf4j.Slf4j;
 
 import org.apache.commons.lang3.StringUtils;
@@ -310,9 +311,9 @@ public class DangerInspectionRecordController {
 	@AutoLog(value = "风险点：巡检情况列表")
 	@ApiOperation(value="风险点：巡检情况列表", notes="风险点：巡检情况列表")
 	@GetMapping(value = "/detail")
-	public Result<DangerLevelManage> queryById(DangerInspectionRecord dangerInspectionRecord) {
-		Result<DangerLevelManage> result = new Result<DangerLevelManage>();
-		DangerLevelManage  dangerLevelManage =  inspectionRecordService.queryListByDangerId(dangerInspectionRecord.getDangerId(),dangerInspectionRecord.getStartTime(),dangerInspectionRecord.getEndDate());
+	public Result<DangerLevelManageVO> queryById(DangerInspectionRecord dangerInspectionRecord) {
+		Result<DangerLevelManageVO> result = new Result<>();
+		DangerLevelManageVO dangerLevelManage =  inspectionRecordService.queryListByDangerId(dangerInspectionRecord.getDangerId(),dangerInspectionRecord.getStartTime(),dangerInspectionRecord.getEndDate());
 		if(dangerLevelManage == null) {
 			result.error500("未找到对应实体");
 		}else {

@@ -162,7 +162,7 @@ public class DangerLevelManageController {
 	@GetMapping(value = "/queryById")
 	public Result<DangerLevelManage> queryById(@RequestParam(name="id",required=true) String id) {
 		Result<DangerLevelManage> result = new Result<DangerLevelManage>();
-		DangerLevelManage dangerLevelManage = dangerLevelManageService.getById(id);
+		DangerLevelManage dangerLevelManage = dangerLevelManageService.queryById(id);
 		if(dangerLevelManage==null) {
 			result.error500("未找到对应实体");
 		}else {

@@ -8,8 +8,10 @@ import com.skua.modules.guest.util.DateUtil;
 import com.skua.modules.safe.entity.*;
 import com.skua.modules.safe.mapper.DangerInspectionItemMapper;
 import com.skua.modules.safe.service.*;
+import com.skua.modules.safe.vo.DangerLevelManageVO;
 import lombok.extern.slf4j.Slf4j;
 
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import io.swagger.annotations.Api;
@@ -52,27 +54,27 @@ public class APPDangerInspectionController {
     @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);
+    public Result<DangerLevelManageVO> queryById(@RequestParam(name="id",required=true) String id) {
+        Result<DangerLevelManageVO> result = new Result<>();
+        DangerLevelManage dangerInspection = dangerLevelManageService.queryById(id);
+        DangerLevelManageVO dangerLevelManageVO = new  DangerLevelManageVO();// dangerInspection ;
+
+        BeanUtils.copyProperties(dangerInspection ,  dangerLevelManageVO);
         //查询：上次巡检时间
         DangerInspectionRecord inspectionRecord  = inspectionRecordService.queryOneByDangerId( id,"2" ,BaseContextHandler.getUserId());//根据分线点编号，获取巡检最后一条记录
         if(inspectionRecord != null ){
-            dangerInspection.setLastInspectionTime( inspectionRecord.getReportDate() );
-            dangerInspection.setLastInspectionStatus( inspectionRecord.getStatus());
+            dangerLevelManageVO.setLastInspectionTime( inspectionRecord.getReportDate() );
+            dangerLevelManageVO.setLastInspectionStatus( inspectionRecord.getStatus());
             String dangerId = id;
-            if(inspectionRecord.getStatus() != "2"){
+            if( !"2".equals(inspectionRecord.getStatus()) ){
                 List<DangerInspectionInfo>   inspectionInfoList = inspectionRecordService.queryInspectionInfoByDangerId(dangerId  ,BaseContextHandler.getUserId());
-                dangerInspection.setInspectionInfoList( inspectionInfoList ) ;
+                dangerLevelManageVO.setInspectionInfoList( inspectionInfoList ) ;
             }
-        }else{
-            dangerInspection = new DangerLevelManage();
-            dangerInspection.setLastInspectionTime("");
         }
         if(dangerInspection==null) {
             result.error500("未找到对应实体");
         }else {
-            result.setResult(dangerInspection);
+            result.setResult(dangerLevelManageVO);
             result.setSuccess(true);
         }
         return result;

@@ -3,12 +3,10 @@ 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 com.skua.core.aspect.annotation.Dict;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -18,7 +16,6 @@ import lombok.experimental.Accessors;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import org.springframework.format.annotation.DateTimeFormat;
 import org.jeecgframework.poi.excel.annotation.Excel;
-
 /**
  * 风险分级管控清单
  */
@@ -27,7 +24,7 @@ import org.jeecgframework.poi.excel.annotation.Excel;
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
 @ApiModel(value="danger_level_manage对象", description="风险分级管控清单")
-public class DangerLevelManage implements  Serializable{
+public class DangerLevelManage{
 
 	/**id*/
 	@TableId(type = IdType.UUID)
@@ -86,8 +83,8 @@ public class DangerLevelManage implements  Serializable{
     @ApiModelProperty(value = "安全四色图")
 	private String dangerFour;
 
-	@Excel(name = "风险点名称", width = 15)
-	@ApiModelProperty(value = "风险点名称")
+	@Excel(name = "风险点位置", width = 15)
+	@ApiModelProperty(value = "风险点位置")
 	private String dangerPlace;
 
 	@Excel(name = "关联设备", width = 15)
@@ -103,7 +100,6 @@ public class DangerLevelManage implements  Serializable{
 	@ApiModelProperty(value = "二维码")
 	private String qrCode;
 
-
 	/**创建人Id*/
     @ApiModelProperty(value = "创建人Id")
 	private String createBy;
@@ -131,18 +127,33 @@ public class DangerLevelManage implements  Serializable{
 	private Integer delFlag;
 
 
+
+	@TableField(exist=false)
+	@ApiModelProperty(value = "厂区名称")
+	private String departName;
+
+
+	@TableField(exist=false)
+	@ApiModelProperty(value = "关联设备名称")
+	private String equipmentName;
+
+
 	@TableField(exist=false)
-	@ApiModelProperty(value = "上次巡检时间")
-	private String lastInspectionTime;
+	@ApiModelProperty(value = "风险等级名称")
+	private String dangerLevelName;
 
 
 	@TableField(exist=false)
-	@ApiModelProperty(value = "上次巡检状态 ")
-	private String lastInspectionStatus;
+	@ApiModelProperty(value = "风险类型名称")
+	private String dangerTypeName;
 
 
 	@TableField(exist=false)
-	@ApiModelProperty(value = "巡检内容对象集合")
-	private List<DangerInspectionInfo> inspectionInfoList;
+	@ApiModelProperty(value = "风险位置名称")
+	private String dangerPlaceName;
+
+
+
+
 
 }

@@ -11,4 +11,10 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface DangerLevelManageMapper extends BaseMapper<DangerLevelManage> {
 
+    /***
+     * 根据id获取风险分级对象
+     * @param id
+     * @return
+     */
+    public  DangerLevelManage queryById(@Param("id") String id);
 }

@@ -2,4 +2,14 @@
 <!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.DangerLevelManageMapper">
 
+
+    <select id="queryById" resultType="com.skua.modules.safe.entity.DangerLevelManage">
+       select d.depart_name ,  ei.equipment_name, di.item_text 'danger_level_name',  di1.item_text 'danger_type_name' , sd.struct_name 'danger_place_name', m.* from danger_level_manage  m
+        left join sys_depart  d on d.id = m.depart_id
+        left join equipment_info  ei on ei.id = m.equip_info_id
+        left join sys_dict_item di on di.item_value = m.danger_level
+        left join sys_dict_item di1 on di1.item_value = m.danger_type
+        left join sys_struct_dict sd on sd.id = m.danger_place
+        where m.id = #{id}
+    </select>
 </mapper>
\ No newline at end of file

@@ -4,6 +4,7 @@ import com.skua.modules.safe.entity.DangerInspectionInfo;
 import com.skua.modules.safe.entity.DangerInspectionRecord;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.skua.modules.safe.entity.DangerLevelManage;
+import com.skua.modules.safe.vo.DangerLevelManageVO;
 
 import java.util.List;
 
@@ -35,7 +36,7 @@ public interface IDangerInspectionRecordService extends IService<DangerInspectio
      * @param endDate
      * @return
      */
-    public DangerLevelManage queryListByDangerId(String dangerId, String startTime, String endDate);
+    public DangerLevelManageVO queryListByDangerId(String dangerId, String startTime, String endDate);
 
 
     /***

@@ -8,4 +8,10 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface IDangerLevelManageService extends IService<DangerLevelManage> {
 
+    /***
+     * 根据id获取风险分级对象
+     * @param id
+     * @return
+     */
+    public  DangerLevelManage queryById(String id);
 }

@@ -5,6 +5,8 @@ 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 com.skua.modules.safe.vo.DangerLevelManageVO;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -164,10 +166,12 @@ public class DangerInspectionRecordServiceImpl extends ServiceImpl<DangerInspect
      * @param endDate
      * @return
      */
-    public DangerLevelManage  queryListByDangerId(String dangerId, String startTime, String endDate){
+    public DangerLevelManageVO  queryListByDangerId(String dangerId, String startTime, String endDate){
 
         DangerLevelManage dangerLevelManage = dangerLevelManageMapper.selectById(dangerId);
+        DangerLevelManageVO  dangerLevelManageVO = new DangerLevelManageVO();
 
+        BeanUtils.copyProperties(dangerLevelManage, dangerLevelManageVO);
         //巡查对象
         LambdaQueryWrapper<DangerInspectionInfo> queryWrapper = new LambdaQueryWrapper<DangerInspectionInfo>();
         queryWrapper.eq(DangerInspectionInfo::getDangerId, dangerId);
@@ -188,12 +192,12 @@ public class DangerInspectionRecordServiceImpl extends ServiceImpl<DangerInspect
                 if(itemList != null ) info.setInspectionItemList( itemList ) ;
             }
 
-            dangerLevelManage.setInspectionInfoList(   inspectionInfoList  );
+            dangerLevelManageVO.setInspectionInfoList(   inspectionInfoList  );
         }
 
 
 
-        return dangerLevelManage;
+        return dangerLevelManageVO;
     }
 
 

 package com.skua.modules.safe.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.skua.modules.safe.entity.DangerLevelManage;
 import com.skua.modules.safe.mapper.DangerLevelManageMapper;
 import com.skua.modules.safe.service.IDangerLevelManageService;
@@ -7,10 +8,20 @@ import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
+import java.util.List;
+
 /**
  * 风险分级管控清单
  */
 @Service
 public class DangerLevelManageServiceImpl extends ServiceImpl<DangerLevelManageMapper, DangerLevelManage> implements IDangerLevelManageService {
 
+    /***
+     * 根据id获取风险分级对象
+     * @param id
+     * @return
+     */
+    public  DangerLevelManage queryById(String id){
+       return this.baseMapper.queryById(id);
+    }
 }

+package com.skua.modules.safe.vo;
+
+import com.skua.modules.safe.entity.DangerInspectionInfo;
+import com.skua.modules.safe.entity.DangerLevelManage;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.util.List;
+
+/**
+ * 风险分级管控清单
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="danger_level_manage对象", description="风险分级管控清单")
+public class DangerLevelManageVO  extends DangerLevelManage {
+
+
+    @ApiModelProperty(value = "上次巡检时间")
+    private String lastInspectionTime;
+
+
+    @ApiModelProperty(value = "上次巡检状态 ")
+    private String lastInspectionStatus;
+
+
+    @ApiModelProperty(value = "巡检内容对象集合")
+    private List<DangerInspectionInfo> inspectionInfoList;
+}