| | |
| | | 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.doublePrevention.service.baseService.PreventRiskDangerCheckAndMeasureService; |
| | | import com.ruoyi.doublePrevention.service.baseService.PreventRiskDangerConfirmLogService; |
| | |
| | | return ApiResult.success("传输hiddenDangerCheckType有误", new ArrayList<HiddenDangerCheck>()); |
| | | } |
| | | List<HiddenDangerCheckPoint> resultList = hdcpService.selectHiddenDangerCheckPointList(hdcp); |
| | | for (HiddenDangerCheckPoint dangerCheckPoint : resultList) { |
| | | PreventRiskDangerInfo dangerInfo = riskService.getDangerInfoByDangerCheckPointId(dangerCheckPoint.getId()); |
| | | if (ObjectUtils.isNotEmpty(dangerInfo)){ |
| | | if (ObjectUtils.isNotEmpty(dangerInfo.getReportTime())){ |
| | | dangerCheckPoint.setReportTime(dangerInfo.getReportTime()); |
| | | } |
| | | } |
| | | } |
| | | return ApiResult.success("请求数据成功", resultList); |
| | | } |
| | | } catch (Exception e) { |
| | |
| | | try { |
| | | HiddenDangerCheckPoint hdcp = new ObjectMapper().readValue(str, HiddenDangerCheckPoint.class); |
| | | HiddenDangerCheckPoint hiddenDangerCheckPoint = hdcpService.selectHiddenDangerCheckPointById(hdcp.getId()); |
| | | PreventRiskDangerInfo dangerInfo = riskService.getDangerInfoByDangerCheckPointId(hiddenDangerCheckPoint.getId()); |
| | | if (ObjectUtils.isNotEmpty(dangerInfo.getReportTime())){ |
| | | hiddenDangerCheckPoint.setReportTime(dangerInfo.getReportTime()); |
| | | } |
| | | return ApiResult.success("隐患查看--成功",hiddenDangerCheckPoint); |
| | | } catch (Exception e) { |
| | | return ApiResult.error("异常"); |
| | |
| | | } |
| | | } |
| | | } |
| | | |
| | | for (HiddenDangerCheckPoint dangerCheckPoint : resultList) { |
| | | PreventRiskDangerInfo dangerInfo = riskService.getDangerInfoByDangerCheckPointId(dangerCheckPoint.getId()); |
| | | if (ObjectUtils.isNotEmpty(dangerInfo)){ |
| | | if (ObjectUtils.isNotEmpty(dangerInfo.getReportTime())){ |
| | | dangerCheckPoint.setReportTime(dangerInfo.getReportTime()); |
| | | } |
| | | } |
| | | } |
| | | resultMap.put("resultList", resultList); |
| | | |
| | | //companyId下总的数据统计 |