From bbb62e8ffcd551de6e76d7c52e831c7e69887fe6 Mon Sep 17 00:00:00 2001
From: guo <guo@guo>
Date: Mon, 27 Nov 2023 18:31:03 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/dangerous/entity/HiddenDangerInspectRecord.java  | 3 +++
 .../dangerous/mapper/xml/HiddenDangerInspectRecordMapper.xml | 5 ++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/zhgd/xmgl/modules/dangerous/entity/HiddenDangerInspectRecord.java b/src/main/java/com/zhgd/xmgl/modules/dangerous/entity/HiddenDangerInspectRecord.java
index fda3f96e4..d237a151a 100644
--- a/src/main/java/com/zhgd/xmgl/modules/dangerous/entity/HiddenDangerInspectRecord.java
+++ b/src/main/java/com/zhgd/xmgl/modules/dangerous/entity/HiddenDangerInspectRecord.java
@@ -227,5 +227,8 @@ public class HiddenDangerInspectRecord implements Serializable {
     @TableField(exist = false)
     @ApiModelProperty(value = "是否是超期未关闭，0否，1是")
     private Integer overdueType;
+    @TableField(exist = false)
+    @ApiModelProperty(value = "检查-隐患检查区域名称（责任区域名称）")
+    private String hiddenDangerInspectRegionName;
 
 }
diff --git a/src/main/java/com/zhgd/xmgl/modules/dangerous/mapper/xml/HiddenDangerInspectRecordMapper.xml b/src/main/java/com/zhgd/xmgl/modules/dangerous/mapper/xml/HiddenDangerInspectRecordMapper.xml
index d53d7fef4..3f117dce6 100644
--- a/src/main/java/com/zhgd/xmgl/modules/dangerous/mapper/xml/HiddenDangerInspectRecordMapper.xml
+++ b/src/main/java/com/zhgd/xmgl/modules/dangerous/mapper/xml/HiddenDangerInspectRecordMapper.xml
@@ -56,7 +56,9 @@
         (case
         when a.change_limit_time &lt; now() and (status = 2 or status = 3)
         then 1
-        else 0 end) overdue_type
+        else 0 end) overdue_type,
+        ir.id as hiddenDangerInspectRegionId,
+        ir.region_name as hiddenDangerInspectRegionName
         from hidden_danger_inspection_record a
         LEFT JOIN enterprise_info b ON a.enterprise_sn = b.enterprise_sn
         LEFT JOIN system_user d ON a.create_user = d.user_id
@@ -65,6 +67,7 @@
         LEFT JOIN inspect_type t ON a.inspect_type_id = t.id
         LEFT JOIN worker_info wk ON wk.id = d.worker_id
         LEFT JOIN enterprise_info en ON en.id = wk.enterprise_id
+        left join hidden_danger_inspect_region ir on ir.id=a.hidden_danger_inspect_region_id
         WHERE a.project_sn = #{param.projectSn}
         <if test="param.createUser != null and param.createUser != ''">
             and a.create_user = #{param.createUser}