From 388665b8ee23042ffd19fb930180f253fc8f3515 Mon Sep 17 00:00:00 2001 From: guoshengxiong <1923636941@qq.com> Date: Fri, 5 Jul 2024 14:27:29 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B4=A8=E9=87=8F=E5=92=8C=E5=AE=89=E5=85=A8?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=B7=B2=E6=92=A4=E5=9B=9E=E7=9A=84=E7=AD=9B?= =?UTF-8?q?=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../quality/controller/QualityInspectionRecordController.java | 2 +- .../quality/mapper/xml/QualityInspectionRecordMapper.xml | 3 +++ .../XzSecurityQualityInspectionRecordController.java | 2 +- .../mapper/xml/XzSecurityQualityInspectionRecordMapper.xml | 3 +++ 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/zhgd/xmgl/modules/quality/controller/QualityInspectionRecordController.java b/src/main/java/com/zhgd/xmgl/modules/quality/controller/QualityInspectionRecordController.java index e40cfac1c..f33edf35a 100644 --- a/src/main/java/com/zhgd/xmgl/modules/quality/controller/QualityInspectionRecordController.java +++ b/src/main/java/com/zhgd/xmgl/modules/quality/controller/QualityInspectionRecordController.java @@ -63,7 +63,7 @@ public class QualityInspectionRecordController { @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合格，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 = "recordStatus", value = "查询类型，1排查记录，2已闭合，3未闭合，4超期未关闭，5待整改，6待复查，7待核验，8不包含已撤回", 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"), @ApiImplicitParam(name = "changeId", value = "整改人", paramType = "body", required = false, dataType = "String"), diff --git a/src/main/java/com/zhgd/xmgl/modules/quality/mapper/xml/QualityInspectionRecordMapper.xml b/src/main/java/com/zhgd/xmgl/modules/quality/mapper/xml/QualityInspectionRecordMapper.xml index 4322fa178..67831daa4 100644 --- a/src/main/java/com/zhgd/xmgl/modules/quality/mapper/xml/QualityInspectionRecordMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/quality/mapper/xml/QualityInspectionRecordMapper.xml @@ -262,6 +262,9 @@ LEFT join subdivision_project subsection on subsection.id = a.subsection_id LEFT join subdivision_project subentry on subentry.id = a.subentry_id WHERE a.project_sn = #{param.projectSn} + + and a.status != 6 + and a.enterprise_id = #{param.enterpriseId} 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 d08267011..cdf13b3d1 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 @@ -67,7 +67,7 @@ public class XzSecurityQualityInspectionRecordController { @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合格，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 = "recordStatus", value = "查询类型，1排查记录，2已闭合，3未闭合，4超期未关闭，5待整改，6待复查，7待核验，8不包含已撤回", 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"), @ApiImplicitParam(name = "changeId", value = "整改人", 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 226473979..1102b4e6b 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 @@ -271,6 +271,9 @@ LEFT JOIN (SELECT quality_id,MAX(rectify_time) as rectify_time FROM xz_security_quality_rectify_record GROUP BY quality_id) r ON r.quality_id = t.id WHERE t.project_sn = #{param.projectSn} + + and t.status != 6 + and t.type = #{param.type}