From 90c11c1c0c95075ba802889f0436394067af0748 Mon Sep 17 00:00:00 2001 From: 16639036659 <577530412@qq.com> Date: 星期四, 15 六月 2023 17:02:31 +0800 Subject: [PATCH] 临时提交-检修记录数据采集 --- src/main/java/com/ruoyi/doublePrevention/service/impl/RiskServiceImpl.java | 30 +++++++++++++++--------------- 1 files changed, 15 insertions(+), 15 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 089841f..436ccd9 100644 --- a/src/main/java/com/ruoyi/doublePrevention/service/impl/RiskServiceImpl.java +++ b/src/main/java/com/ruoyi/doublePrevention/service/impl/RiskServiceImpl.java @@ -1047,21 +1047,21 @@ dangerInfo.setDangerReason(hdcp.getDangerReason()); dangerInfo.setDangerResult(hdcp.getDangerResult()); dangerInfo.setHazardDangerType(hdcp.getHazardDangerType()); - //隐患状态 0未验收 1验收通过 2验收未通过 ,新建时为空 -// if (hdcp.getAcceptStatus() == null){ -// //设置为 空 -// dangerInfo.setDangerState(null); -// } else if (hdcp.getAcceptStatus().equals(0)){ -// //设置为整改中 -// dangerInfo.setDangerState(StatusEnum.RECTIFY_ING.getCode()); -// } else if (hdcp.getAcceptStatus().equals(1)) { -// //设置为已验收 -// dangerInfo.setDangerState(StatusEnum.ACCEPT_SUCCESS.getCode()); -// }else if (hdcp.getAcceptStatus().equals(2)){ -// //设置为超期未整改 -// dangerInfo.setDangerState(StatusEnum.RECTIFY_TIMEOUT_AND_FAIL.getCode()); -// } - dangerInfo.setDangerState(null); //设置为 空 + //隐患状态 0未验收 1验收通过 2验收未通过 + if (hdcp.getAcceptStatus() == null){ + //设置为 空 + dangerInfo.setDangerState(StatusEnum.RECTIFY_ING.getCode()); + } else if (hdcp.getAcceptStatus().equals(0)){ + //设置为整改中 + dangerInfo.setDangerState(StatusEnum.RECTIFY_ING.getCode()); + } else if (hdcp.getAcceptStatus().equals(1)) { + //设置为已验收 + dangerInfo.setDangerState(StatusEnum.ACCEPT_SUCCESS.getCode()); + }else if (hdcp.getAcceptStatus().equals(2)){ + //设置为超期未整改 + dangerInfo.setDangerState(StatusEnum.RECTIFY_TIMEOUT_AND_FAIL.getCode()); + } +// dangerInfo.setDangerState(null); //设置为 空 dangerInfo.setTimeoutFlag(null);//暂时不清楚是否需要此功能,先设为空 //获取上报主配置信息 PreventReportConfig reportConfigById = preventReportConfigService.getReportConfigById(SyncEnum.REPORT_CONFIG_DANGER_INFO.getCode()); -- Gitblit v1.9.2