From 697d7fab9f3c0f81dc609ff2ad2cc39600bc914c Mon Sep 17 00:00:00 2001
From: "zangch@mesnac.com" <zangch@mesnac.com>
Date: Mon, 9 Feb 2026 15:45:23 +0800
Subject: [PATCH] =?UTF-8?q?feat(dms):=20=E6=B7=BB=E5=8A=A0=E5=81=9C?=
 =?UTF-8?q?=E6=9C=BA=E5=8E=9F=E5=9B=A0=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E5=B9=B6=E4=BC=98=E5=8C=96=E5=81=9C=E6=9C=BA=E8=AE=B0=E5=BD=95?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 新增不分页查询所有停机原因信息列表的接口
- 修改停机记录查询SQL，关联停机原因基础表获取准确原因描述
- 修复停机原因字段显示问题，使用nvl函数处理空值情况
- 优化DmsRecordShutDownServiceImpl类的代码格式
---
 .../dms/controller/DmsBaseShutReasonController.java  | 12 ++++++++++++
 .../service/impl/DmsRecordShutDownServiceImpl.java   |  4 ++--
 .../resources/mapper/dms/DmsRecordShutDownMapper.xml |  3 ++-
 3 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/aucma-dms/src/main/java/com/aucma/dms/controller/DmsBaseShutReasonController.java b/aucma-dms/src/main/java/com/aucma/dms/controller/DmsBaseShutReasonController.java
index cbafde3..cbcef12 100644
--- a/aucma-dms/src/main/java/com/aucma/dms/controller/DmsBaseShutReasonController.java
+++ b/aucma-dms/src/main/java/com/aucma/dms/controller/DmsBaseShutReasonController.java
@@ -96,4 +96,16 @@ public class DmsBaseShutReasonController extends BaseController
     {
         return toAjax(dmsBaseShutReasonService.deleteDmsBaseShutReasonByShutReasonIds(shutReasonIds));
     }
+
+    /**
+     * 不分页查询所有停机原因信息列表
+     */
+    //@PreAuthorize("@ss.hasPermi('dms:shutReason:list')" )
+    @GetMapping("/selectDmsBaseShutReasonList")
+    public AjaxResult selectDmsBaseShutReasonList(DmsBaseShutReason dmsBaseShutReason)
+    {
+        List<DmsBaseShutReason> list = dmsBaseShutReasonService.selectDmsBaseShutReasonList(dmsBaseShutReason);
+        return AjaxResult.success(list);
+    }
+    
 }
diff --git a/aucma-dms/src/main/java/com/aucma/dms/service/impl/DmsRecordShutDownServiceImpl.java b/aucma-dms/src/main/java/com/aucma/dms/service/impl/DmsRecordShutDownServiceImpl.java
index 0b6a133..b9df03d 100644
--- a/aucma-dms/src/main/java/com/aucma/dms/service/impl/DmsRecordShutDownServiceImpl.java
+++ b/aucma-dms/src/main/java/com/aucma/dms/service/impl/DmsRecordShutDownServiceImpl.java
@@ -19,8 +19,8 @@ import java.util.List;
  * @date 2024-01-15
  */
 @Service
-public class DmsRecordShutDownServiceImpl implements IDmsRecordShutDownService
-{
+public class DmsRecordShutDownServiceImpl implements IDmsRecordShutDownService{
+
     @Autowired
     private DmsRecordShutDownMapper dmsRecordShutDownMapper;
 
diff --git a/aucma-dms/src/main/resources/mapper/dms/DmsRecordShutDownMapper.xml b/aucma-dms/src/main/resources/mapper/dms/DmsRecordShutDownMapper.xml
index c74dc37..764c0e0 100644
--- a/aucma-dms/src/main/resources/mapper/dms/DmsRecordShutDownMapper.xml
+++ b/aucma-dms/src/main/resources/mapper/dms/DmsRecordShutDownMapper.xml
@@ -30,7 +30,7 @@
                r.machine_id as device_id,
                r.shut_type_id as shut_type,
                r.shut_reason_id,
-               r.shut_reason,
+               nvl(s.shut_reason, r.shut_reason) as shut_reason,
                r.shut_begin_time,
                r.shut_end_time,
                r.shut_time,
@@ -45,6 +45,7 @@
                d.device_name as device_name
         from dms_record_shut_down r
         left join base_deviceledger d on r.machine_id = d.OBJ_ID
+        left join dms_base_shut_reason s on r.shut_reason_id = s.shut_reason_id
     </sql>
 
     <select id="selectDmsRecordShutDownList" parameterType="DmsRecordShutDown" resultMap="DmsRecordShutDownResult">