上海电力增加人员定位显示信息

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;
 }

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>