From aa1ea577a0e56c3cd62818904a35309b26b5cd80 Mon Sep 17 00:00:00 2001
From: pengjie <17373303529@163.com>
Date: Sat, 12 Apr 2025 09:36:25 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E6=B5=B7=E7=94=B5=E5=8A=9B=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E4=BA=BA=E5=91=98=E5=AE=9A=E4=BD=8D=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../zhgd/xmgl/modules/safetyhat/entity/SafetyHatData.java | 8 ++++++++
 .../modules/safetyhat/mapper/xml/SafetyHatDataMapper.xml  | 4 +++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/zhgd/xmgl/modules/safetyhat/entity/SafetyHatData.java b/src/main/java/com/zhgd/xmgl/modules/safetyhat/entity/SafetyHatData.java
index 4e629519f..2684f7a84 100644
--- a/src/main/java/com/zhgd/xmgl/modules/safetyhat/entity/SafetyHatData.java
+++ b/src/main/java/com/zhgd/xmgl/modules/safetyhat/entity/SafetyHatData.java
@@ -121,4 +121,12 @@ public class SafetyHatData implements Serializable {
     @TableField(exist = false)
     @ApiModelProperty(value = "身份证号")
     private java.lang.String idCard;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "电话")
+    private java.lang.String phoneNumber;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "工种")
+    private java.lang.String workerTypeName;
 }
diff --git a/src/main/java/com/zhgd/xmgl/modules/safetyhat/mapper/xml/SafetyHatDataMapper.xml b/src/main/java/com/zhgd/xmgl/modules/safetyhat/mapper/xml/SafetyHatDataMapper.xml
index 6b258bd08..d8a8b5c01 100644
--- a/src/main/java/com/zhgd/xmgl/modules/safetyhat/mapper/xml/SafetyHatDataMapper.xml
+++ b/src/main/java/com/zhgd/xmgl/modules/safetyhat/mapper/xml/SafetyHatDataMapper.xml
@@ -22,7 +22,7 @@
     </select>
 
     <select id="getNewestList" resultType="com.zhgd.xmgl.modules.safetyhat.entity.SafetyHatData">
-        select shd.*, wi.worker_name, ei.enterprise_name from safety_hat_data shd join (
+        select shd.*, wi.worker_name, ei.enterprise_name, wi.id_card, wi.phone_number, wt.type_name workerTypeName from safety_hat_data shd join (
         select max(upload_time) as upload_time, dev_sn
         from safety_hat_data
         where project_sn = #{projectSn}
@@ -35,6 +35,8 @@
         group by dev_sn
         )t on t.upload_time=shd.upload_time and t.dev_sn=shd.dev_sn
         left join worker_info wi on wi.id = shd.worker_info_id
+        left join team_info ti on wi.team_id = ti.id
+        left join worker_type wt on ti.worker_type_id = wt.id
         left join enterprise_info ei on wi.enterprise_id = ei.id
         group by t.dev_sn
     </select>