16639036659
2023-07-11 2f2e78aaf8c6c7f3eaeffeb45e2b9aba2d88278c
任务检索修改,页面全流程隐患上报已测试
已修改2个文件
9 ■■■■■ 文件已修改
src/main/java/com/ruoyi/doublePrevention/service/impl/RiskServiceImpl.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mybatis/doublePrevention/PreventCJReportCheckTaskFromWorkMapper.xml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/ruoyi/doublePrevention/service/impl/RiskServiceImpl.java
@@ -1052,17 +1052,18 @@
        dangerInfo.setDangerReason(hdcp.getDangerReason());
        dangerInfo.setDangerResult(hdcp.getDangerResult());
        dangerInfo.setHazardDangerType(hdcp.getHazardDangerType());
//        if (ObjectUtils.isNotEmpty(hdcp.getsta))
        //隐患状态  0未验收 1验收通过 2验收未通过
        if (hdcp.getAcceptStatus() == null){
            //设置为 空
            dangerInfo.setDangerState(StatusEnum.RECTIFY_ING.getCode());
        } else if (hdcp.getAcceptStatus().equals(0)){
        } else if (hdcp.getAcceptStatus().equals("0")){
            //设置为整改中
            dangerInfo.setDangerState(StatusEnum.RECTIFY_ING.getCode());
        } else if (hdcp.getAcceptStatus().equals(1)) {
        } else if (hdcp.getAcceptStatus().equals("1")) {
            //设置为已验收
            dangerInfo.setDangerState(StatusEnum.ACCEPT_SUCCESS.getCode());
        }else if (hdcp.getAcceptStatus().equals(2)){
        }else if (hdcp.getAcceptStatus().equals("2")){
            //设置为超期未整改
            dangerInfo.setDangerState(StatusEnum.RECTIFY_TIMEOUT_AND_FAIL.getCode());
        }
src/main/resources/mybatis/doublePrevention/PreventCJReportCheckTaskFromWorkMapper.xml
@@ -102,7 +102,7 @@
<!--    PreventCJReportCheckTaskFromWork geByMeasureUUidAndJobId(String measureUuid, Long jobId);-->
    <select id="geByMeasureUUidAndJobId" resultMap="BaseResultMap">
        select * from prevent_cj_report_check_task_from_work
        where work_id = #{jobId} and risk_measure_id = #{measureUuid}
        where work_id = #{jobId} and risk_measure_id = #{measureUuid} and deleted = 0
    </select>