双重预防项目-国泰新华二开定制版
16639036659
2023-06-06 73d5cb4c8b3def02dda3addb09469713cc878ba1
src/main/java/com/ruoyi/doublePrevention/service/impl/RiskServiceImpl.java
@@ -1048,19 +1048,20 @@
        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());
        }
//        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); //设置为 空
        dangerInfo.setTimeoutFlag(null);//暂时不清楚是否需要此功能,先设为空
        //获取上报主配置信息
        PreventReportConfig reportConfigById = preventReportConfigService.getReportConfigById(SyncEnum.REPORT_CONFIG_DANGER_INFO.getCode());
@@ -1231,11 +1232,11 @@
        PreventRiskDangerInfo dangerInfo = new PreventRiskDangerInfo();
        dangerInfo.setDangerCheckPointId(hdcp.getId());
        int acceptStatus = Integer.parseInt(hdcp.getAcceptStatus());
        //如果验收通过,设置为验收成功;验收失败,打回上一级进行整改,设置为整改中
        if (hdcp.getAcceptStatus().equals(0)){
        if (acceptStatus == 0){
            dangerInfo.setDangerState(StatusEnum.RECTIFY_ING.getCode());
        }else if (hdcp.getAcceptStatus().equals(1)){
        }else if (acceptStatus == 1){
            dangerInfo.setDangerState(StatusEnum.ACCEPT_SUCCESS.getCode());
        }