From 2f2e78aaf8c6c7f3eaeffeb45e2b9aba2d88278c Mon Sep 17 00:00:00 2001
From: 16639036659 <577530412@qq.com>
Date: 星期二, 11 七月 2023 16:54:32 +0800
Subject: [PATCH] 任务检索修改，页面全流程隐患上报已测试
---
src/main/resources/mybatis/doublePrevention/PreventCJReportCheckTaskFromWorkMapper.xml | 2 +-
src/main/java/com/ruoyi/doublePrevention/service/impl/RiskServiceImpl.java | 7 ++++---
2 files changed, 5 insertions(+), 4 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 a09fcee..82a44f7 100644
--- a/src/main/java/com/ruoyi/doublePrevention/service/impl/RiskServiceImpl.java
+++ b/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());
}
diff --git a/src/main/resources/mybatis/doublePrevention/PreventCJReportCheckTaskFromWorkMapper.xml b/src/main/resources/mybatis/doublePrevention/PreventCJReportCheckTaskFromWorkMapper.xml
index b7ae120..08f882a 100644
--- a/src/main/resources/mybatis/doublePrevention/PreventCJReportCheckTaskFromWorkMapper.xml
+++ b/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>
--
Gitblit v1.9.2