From cad4c065afbc423c012eedef4a505dba6c80d0c6 Mon Sep 17 00:00:00 2001 From: huangzhen <867127663@qq.com> Date: 星期二, 25 四月 2023 11:08:57 +0800 Subject: [PATCH] 措施和事件增加@RequestBody --- src/main/java/com/ruoyi/doublePrevention/service/impl/RiskServiceImpl.java | 23 +++++++++++++++-------- 1 files changed, 15 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/ruoyi/doublePrevention/service/impl/RiskServiceImpl.java b/src/main/java/com/ruoyi/doublePrevention/service/impl/RiskServiceImpl.java index 2d97036..a1149af 100644 --- a/src/main/java/com/ruoyi/doublePrevention/service/impl/RiskServiceImpl.java +++ b/src/main/java/com/ruoyi/doublePrevention/service/impl/RiskServiceImpl.java @@ -281,11 +281,11 @@ resultVO.setMsg("安全风险分析单元名称不能为空"); return resultVO; } - PreventRiskUnitUuid riskUnit = preventRiskUnitUuidService.getRiskUnitUuidById(riskUnitId); - if (riskUnit == null){ - resultVO.setMsg("安全风险分析单元名称不存在"); - return resultVO; - } +// PreventRiskUnitUuid riskUnit = preventRiskUnitUuidService.getRiskUnitUuidById(riskUnitId); +// if (riskUnit == null){ +// resultVO.setMsg("安全风险分析单元名称不存在"); +// return resultVO; +// } if (StringUtils.isEmpty(riskEventName)){ resultVO.setMsg("安全风险事件名称不能为空"); return resultVO; @@ -369,7 +369,7 @@ */ @Override public ResultVO<List<PreventRiskEventPageQueryRespDTO>> listRiskEventPage(PreventRiskEventPageQueryReqDTO riskEventQueryReqDTO) { - Integer pageIndex = riskEventQueryReqDTO.getPageIndex(); + Integer pageIndex = riskEventQueryReqDTO.getPageNum(); Integer pageSize = riskEventQueryReqDTO.getPageSize(); if (pageIndex == 0 || pageSize == 0){ return new ResultVO<>(ErrorCodes.REQUEST_PARAM_ERROR.getCode(),"当前页码或当前页显示数不能为0"); @@ -690,7 +690,7 @@ */ @Override public ResultVO<List<PreventRiskControlMeasurePageQueryRespDTO>> getRiskControlMeasurePage(PreventRiskControlMeasureQueryReqDTO measureQueryReqDTO) { - Integer pageIndex = measureQueryReqDTO.getPageIndex(); + Integer pageIndex = measureQueryReqDTO.getPageNum(); Integer pageSize = measureQueryReqDTO.getPageSize(); if (pageIndex == 0 || pageSize == 0){ return new ResultVO<>(ErrorCodes.REQUEST_PARAM_ERROR.getCode(),"当前页码或当前页显示数不能为0"); @@ -1316,7 +1316,14 @@ return riskControlMeasureService.getPreventRiskControlMeasureById(unitByBaseCheckPointId.getControlMeasureId()); } - + /** + * 查询隐患附属表信息 + */ + @Override + public PreventRiskDangerInfo getDangerInfoById(Long id) { + PreventRiskDangerInfo dangerInfobyHiddenDangerId = preventRiskDangerInfoService.getByHiddenDangerId(id); + return dangerInfobyHiddenDangerId; + } // /** // * 全流程隐患上报-附属表信息插入 // * */ -- Gitblit v1.9.2