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

@@ -250,6 +250,13 @@ public class DateUtil {
         return date.toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime();
     }
 
+    /***
+     * 获取当前时间
+     * @return
+     */
+    public static String  getCurrentDate(){
+        return  formatDate(new Date(),null);
+    }
 
     /***
      * 字符串日期格式化

+package com.skua.modules.safe.controller;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import com.skua.core.api.vo.Result;
+import com.skua.core.aspect.annotation.AutoLog;
+import com.skua.core.context.BaseContextHandler;
+import com.skua.core.query.QueryGenerator;
+import com.skua.core.service.ISequenceService;
+import com.skua.core.util.ConvertUtils;
+import com.skua.modules.safe.entity.AccidentCase;
+import com.skua.modules.safe.service.IAccidentCaseService;
+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 lombok.extern.slf4j.Slf4j;
+
+import org.jeecgframework.poi.excel.ExcelImportUtil;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.entity.ImportParams;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import org.springframework.web.servlet.ModelAndView;
+import com.alibaba.fastjson.JSON;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+/**
+ * <pre>
+ * 事故案例库
+ * </pre>
+ * @author 开发者姓名
+ * @version V0.1, 开发时间
+ */
+@Slf4j
+@Api(tags="事故案例库")
+@RestController("webAccidentCaseController")
+@RequestMapping("/web/safe/accidentCase")
+public class AccidentCaseController {
+	@Autowired
+	private IAccidentCaseService accidentCaseService;
+
+	/**
+	 * <pre>
+	 * 	分页列表查询
+	 * </pre>
+	 * @param accidentCase
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 * @author 开发者姓名, 开发时间
+	 * @Description: TODO(这里描述这个方法的需求变更情况)
+	 */
+
+	@AutoLog(value = "事故案例库-分页列表查询")
+	@ApiOperation(value="事故案例库-分页列表查询", notes="事故案例库-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<AccidentCase>> queryPageList(AccidentCase accidentCase,
+									  @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+									  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+									  HttpServletRequest req) {
+		Result<IPage<AccidentCase>> result = new Result<IPage<AccidentCase>>();
+		QueryWrapper<AccidentCase> queryWrapper = QueryGenerator.initQueryWrapper(accidentCase, req.getParameterMap());
+		Page<AccidentCase> page = new Page<AccidentCase>(pageNo, pageSize);
+		queryWrapper.orderByDesc("create_time");
+		IPage<AccidentCase> pageList = accidentCaseService.page(page, queryWrapper);
+		result.setSuccess(true);
+		result.setResult(pageList);
+		return result;
+	}
+
+	/**
+	 * <pre>
+	 * 	添加
+	 * </pre>
+	 * @param accidentCase
+	 * @return
+	 * @author 开发者姓名, 开发时间
+	 * @Description: TODO(这里描述这个方法的需求变更情况)
+	 */
+	@AutoLog(value = "事故案例库-添加")
+	@ApiOperation(value="事故案例库-添加", notes="事故案例库-添加")
+	@PostMapping(value = "/add")
+	public Result<AccidentCase> add(@RequestBody AccidentCase accidentCase) {
+		Result<AccidentCase> result = new Result<AccidentCase>();
+		try {
+			accidentCaseService.save(accidentCase);
+			result.success("添加成功！");
+		} catch (Exception e) {
+			log.error(e.getMessage(),e);
+			result.error500("操作失败");
+		}
+		return result;
+	}
+	/**
+	 * <pre>
+	 * 	 编辑
+	 * </pre>
+	 * @param accidentCase
+	 * @return
+	 * @author 开发者姓名, 开发时间
+	 * @Description: TODO(这里描述这个方法的需求变更情况)
+	 */
+	@AutoLog(value = "事故案例库-编辑")
+	@ApiOperation(value="事故案例库-编辑", notes="事故案例库-编辑")
+	@PutMapping(value = "/edit")
+	public Result<AccidentCase> edit(@RequestBody AccidentCase accidentCase) {
+		Result<AccidentCase> result = new Result<AccidentCase>();
+		AccidentCase accidentCaseEntity = accidentCaseService.getById(accidentCase.getId());
+		if(accidentCaseEntity==null) {
+			result.error500("未找到对应实体");
+		}else {
+			boolean ok = accidentCaseService.updateById(accidentCase);
+			//TODO 返回false说明什么？
+			if(ok) {
+				result.success("修改成功!");
+			}
+		}
+
+		return result;
+	}
+	/**
+	 * <pre>
+	 * 	 通过id删除
+	 * </pre>
+	 * @param id
+	 * @return
+	 * @author 开发者姓名, 开发时间
+	 * @Description: TODO(这里描述这个方法的需求变更情况)
+	 */
+	@AutoLog(value = "事故案例库-通过id删除")
+	@ApiOperation(value="事故案例库-通过id删除", notes="事故案例库-通过id删除")
+	@DeleteMapping(value = "/delete")
+	public Result<?> delete(@RequestParam(name="id",required=true) String id) {
+		try {
+			accidentCaseService.removeById(id);
+		} catch (Exception e) {
+			log.error("删除失败",e.getMessage());
+			return Result.error("删除失败!");
+		}
+		return Result.ok("删除成功!");
+	}
+
+	/**
+	 * <pre>
+	 * 	  批量删除
+	 * </pre>
+	 * @param ids
+	 * @return
+	 * @author 开发者姓名, 开发时间
+	 * @Description: TODO(这里描述这个方法的需求变更情况)
+	 */
+	@AutoLog(value = "事故案例库-批量删除")
+	@ApiOperation(value="事故案例库-批量删除", notes="事故案例库-批量删除")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<AccidentCase> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		Result<AccidentCase> result = new Result<AccidentCase>();
+		if(ids==null || "".equals(ids.trim())) {
+			result.error500("参数不识别！");
+		}else {
+			this.accidentCaseService.removeByIds(Arrays.asList(ids.split(",")));
+			result.success("删除成功!");
+		}
+		return result;
+	}
+	/**
+	 * <pre>
+	 * 	 通过id查询
+	 * </pre>
+	 * @param id
+	 * @return
+	 * @author 开发者姓名, 开发时间
+	 * @Description: TODO(这里描述这个方法的需求变更情况)
+	 */
+	@AutoLog(value = "事故案例库-通过id查询")
+	@ApiOperation(value="事故案例库-通过id查询", notes="事故案例库-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<AccidentCase> queryById(@RequestParam(name="id",required=true) String id) {
+		Result<AccidentCase> result = new Result<AccidentCase>();
+		AccidentCase accidentCase = accidentCaseService.getById(id);
+		if(accidentCase==null) {
+			result.error500("未找到对应实体");
+		}else {
+			result.setResult(accidentCase);
+			result.setSuccess(true);
+		}
+		return result;
+	}
+
+   /**
+	 * <pre>
+	 * 	 导出excel
+	 * </pre>
+	 * @param request
+	 * @param response
+	 * @return
+	 * @author 开发者姓名, 开发时间
+	 * @Description: TODO(这里描述这个方法的需求变更情况)
+	 */
+
+  @RequestMapping(value = "/exportXls")
+  public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
+      // Step.1 组装查询条件
+      QueryWrapper<AccidentCase> queryWrapper = null;
+      try {
+          String paramsStr = request.getParameter("paramsStr");
+          if (ConvertUtils.isNotEmpty(paramsStr)) {
+              String deString = URLDecoder.decode(paramsStr, "UTF-8");
+              AccidentCase accidentCase = JSON.parseObject(deString, AccidentCase.class);
+              queryWrapper = QueryGenerator.initQueryWrapper(accidentCase, request.getParameterMap());
+          }
+      } catch (UnsupportedEncodingException e) {
+          e.printStackTrace();
+      }
+
+      //Step.2 AutoPoi 导出Excel
+      ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
+      List<AccidentCase> pageList = accidentCaseService.list(queryWrapper);
+      //导出文件名称
+      mv.addObject(NormalExcelConstants.FILE_NAME, "事故案例库列表");
+      mv.addObject(NormalExcelConstants.CLASS, AccidentCase.class);
+      mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("事故案例库列表数据", "导出人:Jeecg", "导出信息"));
+      mv.addObject(NormalExcelConstants.DATA_LIST, pageList);
+      return mv;
+  }
+
+   /**
+	 * <pre>
+	 * 	 通过excel导入数据
+	 * </pre>
+	 * @param request
+	 * @param response
+	 * @return
+	 * @author 开发者姓名, 开发时间
+	 * @Description: TODO(这里描述这个方法的需求变更情况)
+	 */
+  @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+  public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+      MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
+      Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
+      for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
+          MultipartFile file = entity.getValue();// 获取上传文件对象
+          ImportParams params = new ImportParams();
+          params.setTitleRows(2);
+          params.setHeadRows(1);
+          params.setNeedSave(true);
+          try {
+              List<AccidentCase> listAccidentCases = ExcelImportUtil.importExcel(file.getInputStream(), AccidentCase.class, params);
+              accidentCaseService.saveBatch(listAccidentCases);
+              return Result.ok("文件导入成功！数据行数:" + listAccidentCases.size());
+          } catch (Exception e) {
+              log.error(e.getMessage(),e);
+              return Result.error("文件导入失败:"+e.getMessage());
+          } finally {
+              try {
+                  file.getInputStream().close();
+              } catch (IOException e) {
+                  e.printStackTrace();
+              }
+          }
+      }
+      return Result.ok("文件导入失败！");
+  }
+
+}

@@ -74,7 +74,7 @@ public class DangerInspectInfoController {
 									  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 									  HttpServletRequest req) {
 		Result<IPage<DangerInspectInfo>> result = new Result<IPage<DangerInspectInfo>>();
-		QueryWrapper<DangerInspectInfo> queryWrapper = QueryGenerator.initQueryWrapper(dangerInspectInfo, req.getParameterMap());
+		QueryWrapper<DangerInspectInfo> queryWrapper = new QueryWrapper<>();//QueryGenerator.initQueryWrapper(dangerInspectInfo, req.getParameterMap());
 		Page<DangerInspectInfo> page = new Page<DangerInspectInfo>(pageNo, pageSize);
 		queryWrapper.eq("danger_id",dangerInspectInfo.getDangerId());
 		queryWrapper.orderByDesc("create_time");

@@ -73,7 +73,7 @@ public class DangerInspectItemController {
 									  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 									  HttpServletRequest req) {
 		Result<IPage<DangerInspectItem>> result = new Result<IPage<DangerInspectItem>>();
-		QueryWrapper<DangerInspectItem> queryWrapper = QueryGenerator.initQueryWrapper(dangerInspectItem, req.getParameterMap());
+		QueryWrapper<DangerInspectItem> queryWrapper = new QueryWrapper<>();//QueryGenerator.initQueryWrapper(dangerInspectItem, req.getParameterMap());
 		Page<DangerInspectItem> page = new Page<DangerInspectItem>(pageNo, pageSize);
 		IPage<DangerInspectItem> pageList = dangerInspectItemService.page(page, queryWrapper);
 		queryWrapper.eq("inspect_obj_id", dangerInspectItem.getInspectObjId());

@@ -73,7 +73,7 @@ public class DangerInspectionInfoController {
 									  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 									  HttpServletRequest req) {
 		Result<IPage<DangerInspectionInfo>> result = new Result<IPage<DangerInspectionInfo>>();
-		QueryWrapper<DangerInspectionInfo> queryWrapper = QueryGenerator.initQueryWrapper(dangerInspectionInfo, req.getParameterMap());
+		QueryWrapper<DangerInspectionInfo> queryWrapper = new QueryWrapper<>();//QueryGenerator.initQueryWrapper(dangerInspectionInfo, req.getParameterMap());
 		Page<DangerInspectionInfo> page = new Page<DangerInspectionInfo>(pageNo, pageSize);
 		IPage<DangerInspectionInfo> pageList = dangerInspectionInfoService.page(page, queryWrapper);
 		result.setSuccess(true);

@@ -73,7 +73,7 @@ public class DangerInspectionItemController {
 									  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 									  HttpServletRequest req) {
 		Result<IPage<DangerInspectionItem>> result = new Result<IPage<DangerInspectionItem>>();
-		QueryWrapper<DangerInspectionItem> queryWrapper = QueryGenerator.initQueryWrapper(dangerInspectionItem, req.getParameterMap());
+		QueryWrapper<DangerInspectionItem> queryWrapper =new QueryWrapper<>();// QueryGenerator.initQueryWrapper(dangerInspectionItem, req.getParameterMap());
 		Page<DangerInspectionItem> page = new Page<DangerInspectionItem>(pageNo, pageSize);
 		queryWrapper.eq("inspect_obj_id",dangerInspectionItem.getInspectObjId());
 		queryWrapper.orderByDesc("create_time");

@@ -15,6 +15,7 @@ import com.skua.core.query.QueryGenerator;
 import com.skua.core.service.ISequenceService;
 import com.skua.core.util.ConvertUtils;
 import com.skua.modules.safe.entity.DangerInspectionRecord;
+import com.skua.modules.safe.entity.DangerLevelManage;
 import com.skua.modules.safe.service.IDangerInspectionRecordService;
 import java.util.Date;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -22,6 +23,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.extern.slf4j.Slf4j;
 
+import org.apache.commons.lang3.StringUtils;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.entity.ExportParams;
@@ -52,6 +54,8 @@ public class DangerInspectionRecordController {
 	@Autowired
 	private IDangerInspectionRecordService dangerInspectionRecordService;
 
+	@Autowired
+	private IDangerInspectionRecordService inspectionRecordService ;//巡检对象
 	/**
 	 * <pre>
 	 * 	分页列表查询
@@ -73,8 +77,27 @@ public class DangerInspectionRecordController {
 									  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 									  HttpServletRequest req) {
 		Result<IPage<DangerInspectionRecord>> result = new Result<IPage<DangerInspectionRecord>>();
-		QueryWrapper<DangerInspectionRecord> queryWrapper = QueryGenerator.initQueryWrapper(dangerInspectionRecord, req.getParameterMap());
+		QueryWrapper<DangerInspectionRecord> queryWrapper = new QueryWrapper<>();//QueryGenerator.initQueryWrapper(dangerInspectionRecord, req.getParameterMap());
 		Page<DangerInspectionRecord> page = new Page<DangerInspectionRecord>(pageNo, pageSize);
+		queryWrapper.eq("danger_id", dangerInspectionRecord.getDangerId());
+
+		if(StringUtils.isNotBlank(dangerInspectionRecord.getDangerName())){
+			queryWrapper.like("danger_name", dangerInspectionRecord.getDangerName() ) ;
+		}
+
+		if(StringUtils.isNotBlank(dangerInspectionRecord.getDepartId())){
+			queryWrapper.eq("depart_id", dangerInspectionRecord.getDepartId() ) ;
+		}
+
+		if(StringUtils.isNotBlank(dangerInspectionRecord.getStatus())){
+			queryWrapper.eq("status", dangerInspectionRecord.getStatus() ) ;
+		}
+		if(StringUtils.isNotBlank(dangerInspectionRecord.getStartTime())){
+			queryWrapper.ge("report_date", dangerInspectionRecord.getStartTime() ) ;
+		}
+		if(StringUtils.isNotBlank(dangerInspectionRecord.getEndTime())){
+			queryWrapper.le("report_date",  dangerInspectionRecord.getEndTime() ) ;
+		}
 		IPage<DangerInspectionRecord> pageList = dangerInspectionRecordService.page(page, queryWrapper);
 		result.setSuccess(true);
 		result.setResult(pageList);
@@ -274,4 +297,29 @@ public class DangerInspectionRecordController {
       return Result.ok("文件导入失败！");
   }
 
+
+	/**
+	 * <pre>
+	 * 	 扫描二维码进入：风险点详情
+	 * </pre>
+	 * @param dangerInspectionRecord
+	 * @return
+	 * @author 开发者姓名, 开发时间
+	 * @Description: TODO(这里描述这个方法的需求变更情况)
+	 */
+	@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());
+		if(dangerLevelManage == null) {
+			result.error500("未找到对应实体");
+		}else {
+			result.setResult(dangerLevelManage);
+			result.setSuccess(true);
+		}
+		return result;
+	}
+
 }

@@ -4,6 +4,7 @@ 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.guest.util.DateUtil;
 import com.skua.modules.safe.entity.*;
 import com.skua.modules.safe.mapper.DangerInspectionItemMapper;
 import com.skua.modules.safe.service.*;
@@ -39,7 +40,6 @@ public class APPDangerInspectionController {
     @Autowired
     private IDangerInspectionItemService  inspectionItemService ;//巡检对象，检查项
 
-
     /**
      * <pre>
      * 	 扫描二维码进入：风险点详情
@@ -60,6 +60,7 @@ public class APPDangerInspectionController {
         if(inspection != null ){
             dangerInspection.setLastInspectionTime( inspection.getReportDate() );
         }else{
+            dangerInspection = new DangerLevelManage();
             dangerInspection.setLastInspectionTime("");
         }
         if(dangerInspection==null) {
@@ -127,8 +128,8 @@ public class APPDangerInspectionController {
         return result;
     }
 
-    @AutoLog(value = "巡查内容对象-保存")
-    @ApiOperation(value="巡查内容对象-保存", notes="巡查内容对象-保存")
+    @AutoLog(value = "风险巡检-提交巡检记录")
+    @ApiOperation(value="风险巡检-保存巡检记录", notes="风险巡检-保存巡检记录")
     @PostMapping(value = "/saveInspectionInf")
     public Result<DangerInspectInfo> updateDangerInspectionInfo(@RequestBody DangerInspectionInfo dangerInspectionInfo) {
         Result<DangerInspectInfo> result = new Result<DangerInspectInfo>();
@@ -141,14 +142,25 @@ public class APPDangerInspectionController {
         }
         return result;
     }
-    @AutoLog(value = "结束巡检")
-    @ApiOperation(value="结束巡检", notes="结束巡检")
+    @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>();
+    public Result<DangerInspectionRecord> endInspection(@RequestParam(name="id",required=true) String id) {
+        Result<DangerInspectionRecord> result = new Result<DangerInspectionRecord>();
         try {
+            DangerInspectionRecord  inspectionRecord = inspectionRecordService.getById(id);
+
+            if(inspectionRecord==null) {
+                result.error500("未找到对应实体");
+            }else {
+                inspectionRecord.setEndDate(DateUtil.getCurrentDate() ) ;
+                inspectionRecord.setStatus("2");//结束状态
+                inspectionRecordService.updateById(inspectionRecord);
+
+                result.setResult(inspectionRecord);
+                result.setSuccess(true);
+            }
 
-            //inspectionRecordService.(id);
             result.success("添加成功！");
         } catch (Exception e) {
             log.error(e.getMessage(),e);
@@ -157,5 +169,8 @@ public class APPDangerInspectionController {
         return result;
     }
 
+    /*************************************************************************************************/
+
+   //作废
 
 }

+package com.skua.modules.safe.controller.app;
+
+
+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.core.api.vo.Result;
+import com.skua.core.aspect.annotation.AutoLog;
+import com.skua.core.query.QueryGenerator;
+import com.skua.modules.safe.entity.DangerInspectionRecord;
+import com.skua.modules.safe.entity.DangerLevelManage;
+import com.skua.modules.safe.service.IDangerInspectionItemService;
+import com.skua.modules.safe.service.IDangerInspectionRecordService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+
+@Slf4j
+@Api(tags="隐患排查记录")
+@RestController("appDangerInspectionRecordController")
+@RequestMapping("/app/safe/dangerInspectionRecord")
+public class APPDangerInspectionRecordController {
+    @Autowired
+    private IDangerInspectionRecordService dangerInspectionRecordService;
+
+    @Autowired
+    private IDangerInspectionRecordService inspectionRecordService ;//巡检对象
+
+
+    /**
+     * <pre>
+     * 	分页列表查询
+     * </pre>
+     * @param dangerInspectionRecord
+     * @param pageNo
+     * @param pageSize
+     * @param req
+     * @return
+     * @author 开发者姓名, 开发时间
+     * @Description: TODO(这里描述这个方法的需求变更情况)
+     */
+    @AutoLog(value = "隐患排查记录-分页列表查询")
+    @ApiOperation(value="隐患排查记录-分页列表查询", notes="隐患排查记录-分页列表查询")
+    @GetMapping(value = "/list")
+    public Result<IPage<DangerInspectionRecord>> queryPageList(DangerInspectionRecord dangerInspectionRecord,
+                                                               @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+                                                               @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+                                                               HttpServletRequest req) {
+        Result<IPage<DangerInspectionRecord>> result = new Result<IPage<DangerInspectionRecord>>();
+        QueryWrapper<DangerInspectionRecord> queryWrapper =   new QueryWrapper<DangerInspectionRecord>();// QueryGenerator.initQueryWrapper(dangerInspectionRecord, req.getParameterMap());
+        Page<DangerInspectionRecord> page = new Page<DangerInspectionRecord>(pageNo, pageSize);
+        queryWrapper.eq("danger_id", dangerInspectionRecord.getDangerId());
+
+        if(StringUtils.isNotBlank(dangerInspectionRecord.getStartTime())){
+            queryWrapper.ge("report_date", dangerInspectionRecord.getStartTime() ) ;
+        }
+        if(StringUtils.isNotBlank(dangerInspectionRecord.getEndTime())){
+            queryWrapper.le("report_date",  dangerInspectionRecord.getEndTime() ) ;
+        }
+       // queryWrapper.eq("report_user", BaseContextHandler.getUserId());
+        IPage<DangerInspectionRecord> pageList = dangerInspectionRecordService.page(page, queryWrapper);
+        result.setSuccess(true);
+        result.setResult(pageList);
+        return result;
+    }
+
+
+    /**
+     * <pre>
+     * 	 扫描二维码进入：风险点详情
+     * </pre>
+     * @param dangerInspectionRecord
+     * @return
+     * @author 开发者姓名, 开发时间
+     * @Description: TODO(这里描述这个方法的需求变更情况)
+     */
+    @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());
+        if(dangerLevelManage == null) {
+            result.error500("未找到对应实体");
+        }else {
+            result.setResult(dangerLevelManage);
+            result.setSuccess(true);
+        }
+        return result;
+    }
+}
\ No newline at end of file

+package com.skua.modules.safe.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+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;
+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("safe_accident_case")
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="safe_accident_case对象", description="事故案例库")
+public class AccidentCase {
+    
+	/**id*/
+	@TableId(type = IdType.ID_WORKER_STR)
+    @ApiModelProperty(value = "id")
+	private String id;
+	/**所属机构*/
+	@Excel(name = "所属机构", width = 15)
+    @ApiModelProperty(value = "所属机构")
+	private String departId;
+	/**事故名称*/
+	@Excel(name = "事故名称", width = 15)
+    @ApiModelProperty(value = "事故名称")
+	private String accidentName;
+	/**事故类型*/
+	@Excel(name = "事故类型", width = 15)
+    @ApiModelProperty(value = "事故类型")
+	@Dict(dicCode = "safe_accident_type")
+	private String accidentType;
+	/**发生时间*/
+	@Excel(name = "发生时间", width = 15)
+    @ApiModelProperty(value = "发生时间")
+	private String accidentTime;
+	/**发生地点*/
+	@Excel(name = "发生地点", width = 15)
+    @ApiModelProperty(value = "发生地点")
+	private String accidentPlace;
+	/**责任部门*/
+	@Excel(name = "责任部门", width = 15)
+    @ApiModelProperty(value = "责任部门")
+	private String dutyDepart;
+	/**责任人员（用户id）*/
+	@Excel(name = "责任人员（用户id）", width = 15)
+    @ApiModelProperty(value = "责任人员（用户id）")
+	private String dutyUser;
+	/**事故描述*/
+	@Excel(name = "事故描述", width = 15)
+    @ApiModelProperty(value = "事故描述")
+	private String accidentDescription;
+	/**事故后果*/
+	@Excel(name = "事故后果", width = 15)
+    @ApiModelProperty(value = "事故后果")
+	private String accidentResult;
+	/**应急措施*/
+	@Excel(name = "应急措施", width = 15)
+    @ApiModelProperty(value = "应急措施")
+	private String measures;
+	/**事故总结*/
+	@Excel(name = "事故总结", width = 15)
+    @ApiModelProperty(value = "事故总结")
+	private String accidentSummary;
+	/**事故照片*/
+	@Excel(name = "事故照片", width = 15)
+    @ApiModelProperty(value = "事故照片")
+	private String accidentImg;
+	/**事故报告文件*/
+	@Excel(name = "事故报告文件", width = 15)
+    @ApiModelProperty(value = "事故报告文件")
+	private String accidentFile;
+	/**备注*/
+	@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;
+}

@@ -23,7 +23,7 @@ import org.jeecgframework.poi.excel.annotation.Excel;
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
 @ApiModel(value="danger_inspect_item对象", description="风险检查项")
-public class DangerInspectItem {
+public class DangerInspectItem implements  Serializable{
     
 	/**id*/
 	@TableId(type = IdType.ID_WORKER_STR)

@@ -25,7 +25,7 @@ import org.jeecgframework.poi.excel.annotation.Excel;
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
 @ApiModel(value="danger_inspection_info对象", description="巡检对象")
-public class DangerInspectionInfo {
+public class DangerInspectionInfo   implements  Serializable{
     
 	/**id*/
 	@TableId(type = IdType.ID_WORKER_STR)

@@ -23,7 +23,7 @@ import org.jeecgframework.poi.excel.annotation.Excel;
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
 @ApiModel(value="danger_inspection_item对象", description="风险检查项记录")
-public class DangerInspectionItem {
+public class DangerInspectionItem implements  Serializable{
     
 	/**id*/
 	@TableId(type = IdType.ID_WORKER_STR)
@@ -46,6 +46,12 @@ public class DangerInspectionItem {
 	@Excel(name = "选项类型（0:选择，1 是否  2 文本）", width = 15)
     @ApiModelProperty(value = "选项类型（0:选择，1 是否  2 文本）")
 	private String itemType;
+
+
+	/**选项状态（0:异常，1正常）*/
+	@Excel(name = "检查值", width = 15)
+	@ApiModelProperty(value = "检查值")
+	private String itemValue;
 	/**选项状态（0:异常，1正常）*/
 	@Excel(name = "选项状态（0:异常，1正常）", width = 15)
     @ApiModelProperty(value = "选项状态（0:异常，1正常）")

@@ -25,7 +25,7 @@ import org.jeecgframework.poi.excel.annotation.Excel;
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
 @ApiModel(value="danger_inspection_record对象", description="巡检记录")
-public class DangerInspectionRecord {
+public class DangerInspectionRecord implements  Serializable{
     
 	/**id*/
 	@TableId(type = IdType.ID_WORKER_STR)
@@ -39,6 +39,11 @@ public class DangerInspectionRecord {
 	@Excel(name = "风险等级编号", width = 15)
     @ApiModelProperty(value = "风险等级编号")
 	private String dangerId;
+
+	/**风险等级编号*/
+	@Excel(name = "风险等级名称", width = 15)
+	@ApiModelProperty(value = "风险等级名称")
+	private String dangerName;
 	/**上报人（用户id）*/
 	@Excel(name = "上报人（用户id）", width = 15)
     @ApiModelProperty(value = "上报人（用户id）")
@@ -47,6 +52,14 @@ public class DangerInspectionRecord {
 	@Excel(name = "上报时间", width = 15)
     @ApiModelProperty(value = "上报时间")
 	private String reportDate;
+
+
+	/**上报时间*/
+	@Excel(name = "结束时间", width = 15)
+	@ApiModelProperty(value = "结束时间")
+	private String endDate;
+
+
 	/**巡检状态(0:未开始，1:开始，2:结束，3：作废)*/
 	@Excel(name = "巡检状态(0:未开始，1:开始，2:结束，3：作废)", width = 15)
     @ApiModelProperty(value = "巡检状态(0:未开始，1:开始，2:结束，3：作废)")
@@ -83,4 +96,13 @@ public class DangerInspectionRecord {
 	@TableField(exist=false)
 	@ApiModelProperty(value = "巡检对象集合")
 	private List<DangerInspectionInfo>  inspectionInfoList ;
+
+	@TableField(exist=false)
+	@ApiModelProperty(value = "条件：开始时间")
+	private String startTime;
+
+	@TableField(exist=false)
+	@ApiModelProperty(value = "条件：结束时间")
+	private String endTime;
+
 }

@@ -2,6 +2,8 @@ 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;
@@ -25,7 +27,7 @@ import org.jeecgframework.poi.excel.annotation.Excel;
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
 @ApiModel(value="danger_level_manage对象", description="风险分级管控清单")
-public class DangerLevelManage {
+public class DangerLevelManage implements  Serializable{
 
 	/**id*/
 	@TableId(type = IdType.UUID)
@@ -133,4 +135,8 @@ public class DangerLevelManage {
 	@ApiModelProperty(value = "上次巡检时间")
 	private String lastInspectionTime;
 
+	@TableField(exist=false)
+	@ApiModelProperty(value = "巡检内容对象集合")
+	private List<DangerInspectionInfo> inspectionInfoList;
+
 }

+package com.skua.modules.safe.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import com.skua.modules.safe.entity.AccidentCase;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * 事故案例库
+ */
+public interface AccidentCaseMapper extends BaseMapper<AccidentCase> {
+
+}

+<?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.AccidentCaseMapper">
+
+</mapper>
\ No newline at end of file

+package com.skua.modules.safe.service;
+
+import com.skua.modules.safe.entity.AccidentCase;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * 事故案例库
+ */
+public interface IAccidentCaseService extends IService<AccidentCase> {
+
+}

@@ -3,6 +3,7 @@ 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 com.skua.modules.safe.entity.DangerLevelManage;
 
 import java.util.List;
 
@@ -26,4 +27,13 @@ public interface IDangerInspectionRecordService extends IService<DangerInspectio
      * @return
      */
     public DangerInspectionRecord startInspection(String dangerId, String status , String userId);
+
+    /***
+     * 查询巡查集合
+     * @param dangerId
+     * @param startTime
+     * @param endDate
+     * @return
+     */
+    public DangerLevelManage queryListByDangerId(String dangerId, String startTime, String endDate);
 }

+package com.skua.modules.safe.service.impl;
+
+import com.skua.modules.safe.entity.AccidentCase;
+import com.skua.modules.safe.mapper.AccidentCaseMapper;
+import com.skua.modules.safe.service.IAccidentCaseService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * 事故案例库
+ */
+@Service
+public class AccidentCaseServiceImpl extends ServiceImpl<AccidentCaseMapper, AccidentCase> implements IAccidentCaseService {
+
+}

@@ -87,6 +87,7 @@ public class DangerInspectInfoServiceImpl extends ServiceImpl<DangerInspectInfoM
         if(dangerInspectInfo.getItemList() != null ){
             for(DangerInspectItem  dangerInspectItem :  dangerInspectInfo.getItemList()){
                 dangerInspectItem.setInspectObjId( dangerInspectInfo.getId() ) ;
+                dangerInspectItem.setDangerId(  dangerInspectInfo.getDangerId());
                 inspectItemMapper.insert(dangerInspectItem) ;
             }
         }
@@ -105,6 +106,7 @@ public class DangerInspectInfoServiceImpl extends ServiceImpl<DangerInspectInfoM
         if(dangerInspectInfo.getItemList() != null ){
             for(DangerInspectItem  dangerInspectItem :  dangerInspectInfo.getItemList()){
                 dangerInspectItem.setInspectObjId( dangerInspectInfo.getId() ) ;
+                dangerInspectItem.setDangerId(  dangerInspectInfo.getDangerId());
                 inspectItemMapper.insert(dangerInspectItem) ;
             }
         }

@@ -61,6 +61,7 @@ public class DangerInspectionRecordServiceImpl extends ServiceImpl<DangerInspect
             DangerLevelManage  dangerLevelManage =  dangerLevelManageMapper.selectById(dangerId );
             dangerInspection = new  DangerInspectionRecord();
             dangerInspection.setDepartId(dangerLevelManage.getDepartId());
+            dangerInspection.setDangerName(dangerLevelManage.getDangerName()  );//风险等级名称
             dangerInspection.setDangerId( dangerId  );
             dangerInspection.setStatus( status);
             dangerInspection.setReportUser( userId );
@@ -89,6 +90,7 @@ public class DangerInspectionRecordServiceImpl extends ServiceImpl<DangerInspect
                     inspectionInfo.setInspectMethod(   dangerInspectInfo.getInspectMethod());
                     inspectionInfo.setInspectStandard( dangerInspectInfo.getInspectStandard() );
                     inspectionInfo.setReportUser( userId) ;
+                    inspectionInfo.setInspectObjId( dangerInspectInfo.getId() );
                     dangerInspectionInfoMapper.insert(inspectionInfo);
 
                     //搜索检查内容对象，检查项目
@@ -153,4 +155,46 @@ public class DangerInspectionRecordServiceImpl extends ServiceImpl<DangerInspect
 
         return inspectionInfoList;
     }
+
+
+    /***
+     * 查询巡查集合
+     * @param dangerId
+     * @param startTime
+     * @param endDate
+     * @return
+     */
+    public DangerLevelManage  queryListByDangerId(String dangerId, String startTime, String endDate){
+
+        DangerLevelManage dangerLevelManage = dangerLevelManageMapper.selectById(dangerId);
+
+        //巡查对象
+        LambdaQueryWrapper<DangerInspectionInfo> queryWrapper = new LambdaQueryWrapper<DangerInspectionInfo>();
+        queryWrapper.eq(DangerInspectionInfo::getDangerId, dangerId);
+        queryWrapper.orderByAsc(DangerInspectionInfo::getCreateTime  );
+        List<DangerInspectionInfo> inspectionInfoList = dangerInspectionInfoMapper.selectList(queryWrapper);
+
+
+
+        if(inspectionInfoList != null && !inspectionInfoList.isEmpty()){
+
+            LambdaQueryWrapper<DangerInspectionItem> queryItemWrapper = new LambdaQueryWrapper<DangerInspectionItem>();
+            List<DangerInspectionItem> itemList  = null;
+            for( DangerInspectionInfo info  : inspectionInfoList){
+                queryItemWrapper.eq(DangerInspectionItem::getInspectionInfoId, info.getId());
+                queryItemWrapper.orderByAsc(DangerInspectionItem::getCreateTime  );
+
+                itemList =  dangerInspectionItemMapper.selectList(queryItemWrapper);
+                if(itemList != null ) info.setInspectionItemList( itemList ) ;
+            }
+
+            dangerLevelManage.setInspectionInfoList(   inspectionInfoList  );
+        }
+
+
+
+        return dangerLevelManage;
+    }
+
+
 }