From 3e5a90f4a81628c6063cf5ea93040da8d4bc73b9 Mon Sep 17 00:00:00 2001
From: guoshengxiong <1923636941@qq.com>
Date: Wed, 12 Jun 2024 16:09:48 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=89=E5=85=A8=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../XzSecurityQualityInspectionRecordController.java         | 2 +-
 .../mapper/xml/XzSecurityQualityInspectionRecordMapper.xml   | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/zhgd/xmgl/modules/xz.security/controller/XzSecurityQualityInspectionRecordController.java b/src/main/java/com/zhgd/xmgl/modules/xz.security/controller/XzSecurityQualityInspectionRecordController.java
index 393d5bc27..039c45284 100644
--- a/src/main/java/com/zhgd/xmgl/modules/xz.security/controller/XzSecurityQualityInspectionRecordController.java
+++ b/src/main/java/com/zhgd/xmgl/modules/xz.security/controller/XzSecurityQualityInspectionRecordController.java
@@ -71,7 +71,7 @@ public class XzSecurityQualityInspectionRecordController {
             @ApiImplicitParam(name = "projectSn", value = "项目SN", paramType = "body", required = true, dataType = "String"),
             @ApiImplicitParam(name = "regionId", value = "检查部位ID", paramType = "body", required = false, dataType = "String"),
             @ApiImplicitParam(name = "itemId", value = "子任务ID", paramType = "body", required = false, dataType = "String"),
-            @ApiImplicitParam(name = "status", value = "状态，1无需整改，2待整改，3待复查，4待核验，5合格，6不合格，7超期未关闭", paramType = "body", required = false, dataType = "String"),
+            @ApiImplicitParam(name = "status", value = "状态，1无需整改，2待整改，3待复查，4待核验，5合格，60不合格，7超期未关闭", paramType = "body", required = false, dataType = "String"),
             @ApiImplicitParam(name = "recordStatus", value = "查询类型，1排查记录，2已闭合，3未闭合，4超期未关闭，5待整改，6待复查，7待核验", paramType = "body", required = false, dataType = "String"),
             @ApiImplicitParam(name = "urgentLevel", value = "紧急程度，1一般，2严重，3紧要", paramType = "body", required = false, dataType = "String"),
             @ApiImplicitParam(name = "level", value = "问题等级，1一级，2二级，3三级，4四级", paramType = "body", required = false, dataType = "String"),
diff --git a/src/main/java/com/zhgd/xmgl/modules/xz.security/mapper/xml/XzSecurityQualityInspectionRecordMapper.xml b/src/main/java/com/zhgd/xmgl/modules/xz.security/mapper/xml/XzSecurityQualityInspectionRecordMapper.xml
index 44d6ab4f3..df505c505 100644
--- a/src/main/java/com/zhgd/xmgl/modules/xz.security/mapper/xml/XzSecurityQualityInspectionRecordMapper.xml
+++ b/src/main/java/com/zhgd/xmgl/modules/xz.security/mapper/xml/XzSecurityQualityInspectionRecordMapper.xml
@@ -316,13 +316,16 @@
         <if test="param.level != null and param.level != ''">
             and t.level = #{param.level}
         </if>
-        <if test="param.status != null and param.status != '' and param.status != '7'.toString()">
+        <if test="param.status != null and param.status != '' and param.status != '7'.toString() and param.status != '60'.toString()">
             and t.status = #{param.status}
         </if>
         <if test="param.status == '7'.toString()">
             and t.change_limit_time <![CDATA[<]]> current_date
             and t.status != 5 and t.status != 6
         </if>
+        <if test="param.status == '60'.toString()">
+            and t.status != 5 and t.status != 6
+        </if>
         <if test="param.urgentLevel != null and param.urgentLevel != ''">
             and t.urgent_level = #{param.urgentLevel}
         </if>