临时提交-已经与app端对接完成

16639036659

2023-06-26 28f6c716269ce5435b103137dd7ec1f1f9ab19ba

 src/main/java/com/ruoyi/doublePrevention/service/impl/RiskServiceImpl.java

@@ -944,7 +944,7 @@
        PreventRiskDangerCheckLog dangerCheck = new PreventRiskDangerCheckLog();



        dangerCheck.setUuid(dangerCheckUuid);

        dangerCheck.setCheckStatus(null);//

        dangerCheck.setCheckStatus((byte) 2);//

        dangerCheck.setCheckId(checkId);

        dangerCheck.setJobId(hdc.getJobId());

        //获取上报主配置信息

@@ -1047,10 +1047,10 @@
        dangerInfo.setDangerReason(hdcp.getDangerReason());

        dangerInfo.setDangerResult(hdcp.getDangerResult());

        dangerInfo.setHazardDangerType(hdcp.getHazardDangerType());

        //隐患状态  0未验收 1验收通过 2验收未通过 ，新建时为空

        //隐患状态  0未验收 1验收通过 2验收未通过

        if (hdcp.getAcceptStatus() == null){

            //设置为 空

            dangerInfo.setDangerState(null);

            dangerInfo.setDangerState(StatusEnum.RECTIFY_ING.getCode());

        } else if (hdcp.getAcceptStatus().equals(0)){

            //设置为整改中

            dangerInfo.setDangerState(StatusEnum.RECTIFY_ING.getCode());

@@ -1061,6 +1061,7 @@
            //设置为超期未整改

            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());

        }



@@ -1325,6 +1326,21 @@
        PreventRiskDangerInfo dangerInfobyHiddenDangerId = preventRiskDangerInfoService.getByHiddenDangerId(id);

        return dangerInfobyHiddenDangerId;

    }



    @Override

    public int updateCheckLog(Long checkId, HiddenDangerCheckPoint hdcp) {

        return preventRiskDangerCheckLogService.updateCheckLog(checkId, hdcp.getMobileCode());

    }





















    //    /**

//     * 全流程隐患上报-附属表信息插入

//     * */

@@ -1368,4 +1384,6 @@
//

//        return preventRiskDangerInfoService.insertDangerInfo(dangerInfo);

//    }





}