From 5f1ab44b47d1e28121ecf6983fada2bc628a69fb Mon Sep 17 00:00:00 2001 From: 16639036659 <577530412@qq.com> Date: 星期二, 16 五月 2023 10:37:48 +0800 Subject: [PATCH] 娄哥的库 --- src/main/java/com/ruoyi/doublePrevention/service/impl/RiskServiceImpl.java | 17 +++++++++-------- 1 files changed, 9 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 f41c0fd..07324fc 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"); @@ -851,6 +851,7 @@ @Transactional @Override public int updateJobAndMeasure(HiddenDangerCheckJob hiddenDangerCheckJob) { + // 2、若有变更,需要预先读取jobAndMeasure的uuid,保存下来 PreventRiskJobAndMeasure jobAndMeasureByJobId = preventRiskJobAndMeasureService.getJobAndMeasureByJobId(hiddenDangerCheckJob.getJobId()); String jobUuid = jobAndMeasureByJobId.getJobUuid(); @@ -943,7 +944,7 @@ PreventRiskDangerCheckLog dangerCheck = new PreventRiskDangerCheckLog(); dangerCheck.setUuid(dangerCheckUuid); - dangerCheck.setCheckStatus(null);// + dangerCheck.setCheckStatus((byte) 2);// dangerCheck.setCheckId(checkId); dangerCheck.setJobId(hdc.getJobId()); //获取上报主配置信息 -- Gitblit v1.9.2