双重预防项目-国泰新华二开定制版
16639036659
2023-06-26 28f6c716269ce5435b103137dd7ec1f1f9ab19ba
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());
@@ -1326,6 +1326,21 @@
        PreventRiskDangerInfo dangerInfobyHiddenDangerId = preventRiskDangerInfoService.getByHiddenDangerId(id);
        return dangerInfobyHiddenDangerId;
    }
    @Override
    public int updateCheckLog(Long checkId, HiddenDangerCheckPoint hdcp) {
        return preventRiskDangerCheckLogService.updateCheckLog(checkId, hdcp.getMobileCode());
    }
    //    /**
//     * 全流程隐患上报-附属表信息插入
//     * */
@@ -1369,4 +1384,6 @@
//
//        return preventRiskDangerInfoService.insertDangerInfo(dangerInfo);
//    }
}