Merge branch 'han' of uskycloud/usky-modules into server-165

service-fire/service-fire-biz/src/main/java/com/usky/fire/domain/PatrolInspectionPersonnel.java

@@ -2,6 +2,8 @@ package com.usky.fire.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
+
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.io.Serializable;
 import lombok.Data;
@@ -104,5 +106,38 @@ public class PatrolInspectionPersonnel implements Serializable {
      */
     private String idCard;
 
+    /**
+     * 姓名
+     */
+    private String fullName;
+
+    /**
+     * 是否在职（0、不在职 1、在职）
+     */
+    private Integer whetherEmploy;
+
+    /**
+     * 出生日期
+     */
+    private LocalDate birthDate;
+
+    /**
+     * 用户性别（0男 1女 2未知）
+     */
+    private Integer sex;
+
+    /**
+     * 联系电话
+     */
+    private String phoneNumber;
 
+    /**
+     * 主要职务
+     */
+    private Integer mainPosition;
+
+    /**
+     * 服务内容
+     */
+    private String serviceContent;
 }

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/impl/PatrolInspectionPersonnelServiceImpl.java

@@ -150,6 +150,13 @@ public class PatrolInspectionPersonnelServiceImpl extends AbstractCrudService<Pa
                 patrolInspectionPersonnelVo.setResidence(list.get(i).getResidence());
                 patrolInspectionPersonnelVo.setPhysicsCard(list.get(i).getPhysicsCard());
                 patrolInspectionPersonnelVo.setIdCard(list.get(i).getIdCard());
+                patrolInspectionPersonnelVo.setFullName(list.get(i).getFullName());
+                patrolInspectionPersonnelVo.setWhetherEmploy(list.get(i).getWhetherEmploy());
+                patrolInspectionPersonnelVo.setBirthDate(list.get(i).getBirthDate());
+                patrolInspectionPersonnelVo.setSex(list.get(i).getSex());
+                patrolInspectionPersonnelVo.setPhoneNumber(list.get(i).getPhoneNumber());
+                patrolInspectionPersonnelVo.setMainPosition(list.get(i).getMainPosition());
+                patrolInspectionPersonnelVo.setServiceContent(list.get(i).getServiceContent());
                 for (int j = 0; j < userList.size(); j++) {
                     if (list.get(i).getUserId().longValue() == userList.get(j).getUserId()) {
                         patrolInspectionPersonnelVo.setName(userList.get(j).getNickName());

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/vo/PatrolInspectionPersonnelVo.java

@@ -7,6 +7,7 @@ import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
 import java.io.Serializable;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 
 /**
@@ -105,5 +106,39 @@ public class PatrolInspectionPersonnelVo implements Serializable {
      */
     private String idCard;
 
+    /**
+     * 姓名
+     */
+    private String fullName;
+
+    /**
+     * 是否在职（0、不在职 1、在职）
+     */
+    private Integer whetherEmploy;
+
+    /**
+     * 出生日期
+     */
+    private LocalDate birthDate;
+
+    /**
+     * 用户性别（0男 1女 2未知）
+     */
+    private Integer sex;
+
+    /**
+     * 联系电话
+     */
+    private String phoneNumber;
+
+    /**
+     * 主要职务
+     */
+    private Integer mainPosition;
+
+    /**
+     * 服务内容
+     */
+    private String serviceContent;
 
 }

service-fire/service-fire-biz/src/main/resources/mapper/fire/PatrolInspectionPersonnelMapper.xml

@@ -20,6 +20,13 @@
         <result column="residence" property="residence" />
         <result column="physics_card" property="physicsCard" />
         <result column="id_card" property="idCard" />
+        <result column="full_name" property="fullName" />
+        <result column="whether_employ" property="whetherEmploy" />
+        <result column="birth_date" property="birthDate" />
+        <result column="sex" property="sex" />
+        <result column="phone_number" property="phoneNumber" />
+        <result column="main_position" property="mainPosition" />
+        <result column="service_content" property="serviceContent" />
     </resultMap>
 
 </mapper>