质量和安全增加已撤回的筛选

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"),

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}
+        <if test="param.recordStatus == '8'.toString() ">
+            and a.status != 6
+        </if>
         <if test="param.enterpriseId != null and param.enterpriseId != ''">
             and a.enterprise_id = #{param.enterpriseId}
         </if>

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"),

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}
+        <if test="param.recordStatus == '8'.toString() ">
+            and t.status != 6
+        </if>
         <if test="param.type != null and param.type != ''">
             and t.type = #{param.type}
         </if>