| | |
| | | import com.ruoyi.common.utils.DateUtils; |
| | | import com.ruoyi.common.utils.StringUtils; |
| | | import com.ruoyi.common.utils.security.ShiroUtils; |
| | | import com.ruoyi.doublePrevention.entity.PreventRiskDangerInfo; |
| | | import com.ruoyi.doublePrevention.service.RiskService; |
| | | import com.ruoyi.framework.aspectj.lang.annotation.Log; |
| | | import com.ruoyi.framework.aspectj.lang.enums.BusinessType; |
| | |
| | | } |
| | | |
| | | /** |
| | | * 查询隐患排查列表 |
| | | * 查询隐患排查列表头 |
| | | */ |
| | | @PostMapping("/list") |
| | | @ResponseBody |
| | |
| | | startPage(); |
| | | hiddenDangerCheckPoint.setAcceptUserId(getSysUser().getUserId());//验收人为本登录帐号userId的 |
| | | List<HiddenDangerCheckPoint> list = hiddenDangerCheckPointService.selectHiddenDangerCheckPointList(hiddenDangerCheckPoint); |
| | | for (HiddenDangerCheckPoint dangerCheckPoint : list) { |
| | | PreventRiskDangerInfo dangerInfo = riskService.getDangerInfoByDangerCheckPointId(dangerCheckPoint.getId()); |
| | | if (ObjectUtils.isNotEmpty(dangerInfo)){ |
| | | if (ObjectUtils.isNotEmpty(dangerInfo.getReportTime())){ |
| | | dangerCheckPoint.setReportTime(dangerInfo.getReportTime()); |
| | | } |
| | | } |
| | | } |
| | | return getDataTable(list); |
| | | } |
| | | |
| | |
| | | public String detailDangerAccept(@PathVariable("id") Long id, ModelMap mmap) { |
| | | //隐患排查实体 |
| | | HiddenDangerCheckPoint hiddenDangerCheckPoint = hiddenDangerCheckPointService.selectHiddenDangerCheckPointById(Long.valueOf(id)); |
| | | PreventRiskDangerInfo dangerInfo = riskService.getDangerInfoByDangerCheckPointId(hiddenDangerCheckPoint.getId()); |
| | | if (ObjectUtils.isNotEmpty(dangerInfo)){ |
| | | if (ObjectUtils.isNotEmpty(dangerInfo.getReportTime())){ |
| | | hiddenDangerCheckPoint.setReportTime(dangerInfo.getReportTime()); |
| | | } |
| | | } |
| | | mmap.put("hdcp", hiddenDangerCheckPoint); |
| | | return prefix + "/detailDangerAccept"; |
| | | } |