From 2d69ba474037edfe5ae18dfd400a7151b47a5081 Mon Sep 17 00:00:00 2001
From: guoshengxiong <1923636941@qq.com>
Date: Wed, 12 Jun 2024 14:19:06 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=89=E5=85=A8=E4=BF=AE=E6=94=B9=E6=8E=92?=
 =?UTF-8?q?=E5=BA=8F=E6=96=B9=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../XzSecurityQualityInspectionRecordController.java     | 1 +
 .../xml/XzSecurityQualityInspectionRecordMapper.xml      | 9 ++++++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

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 c11113893..393d5bc27 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
@@ -93,6 +93,7 @@ public class XzSecurityQualityInspectionRecordController {
             @ApiImplicitParam(name = "isOverdueRectification", value = "是否超期未整改1是", paramType = "body", required = false, dataType = "Integer"),
             @ApiImplicitParam(name = "enterpriseId", value = "合作单位id", paramType = "body", required = false, dataType = "String"),
             @ApiImplicitParam(name = "type", value = "1危大2动火3受限空间4盲板抽堵5高出6吊装7临时用电8动土9断路", paramType = "body", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "orderBy", value = "1整改时间倒序（默认）2按照每条记录的状态的时间倒序", paramType = "body", required = false, dataType = "Integer"),
     })
     @PostMapping(value = {"/list", "/page"})
     public Result<XzSecurityRecordVo> queryPageList(@RequestBody Map<String, Object> map) {
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 d8ef5f1ca..44d6ab4f3 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
@@ -265,6 +265,8 @@
         LEFT join subdivision_project subsection on subsection.id = t.subsection_id
         LEFT join subdivision_project subentry on subentry.id = t.subentry_id
         LEFT join dangerous_engineering_record der on der.id = t.engineering_id
+        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.type != null and param.type != ''">
             and t.type = #{param.type}
@@ -372,7 +374,12 @@
         <if test="param.engineeringId != null and param.engineeringId != ''">
             and t.engineering_id = #{param.engineeringId}
         </if>
-        order by t.inspect_time desc, t.id desc
+        <if test="param.orderBy == null or param.orderBy == '1'.toString()">
+            order by t.inspect_time desc, t.id desc
+        </if>
+        <if test="param.orderBy == '2'.toString()">
+            ORDER BY IFNULL(r.rectify_time,t.create_time) desc
+        </if>
     </select>
     <select id="selectQualityInspectionRecordPageTotal"
             resultType="com.zhgd.xmgl.modules.xz.security.entity.vo.XzSecurityQualityInspectionRecordTotalVo">