消防队伍人员返回字段修改

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/FirefightersDto.java

@@ -35,6 +35,9 @@ public class FirefightersDto extends BaseDto {
     @ApiModelProperty(value = "队伍id")
     private String fireTeamId;
 
+    @ApiModelProperty(value = "队伍名称")
+    private String fireTeamName;
+
     @ApiModelProperty(value = "姓名")
     private String name;
 
@@ -68,6 +71,9 @@ public class FirefightersDto extends BaseDto {
     @ApiModelProperty(value = "岗位名称")
     private String jobTitle;
 
+    @ApiModelProperty(value = "岗位code")
+    private String jobTitleCode;
+
     @ApiModelProperty(value = "人员状态，在职/离职")
     private String state;
 

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/FireTeamMapper.xml

@@ -14,8 +14,11 @@
         GROUP BY ft.sequence_nbr
     </select>
     <select id="queryFighterByTeamId" resultType="com.yeejoin.amos.boot.module.common.api.dto.FirefightersDto">
-        select *
-        from cb_firefighters
+        SELECT
+        ff.*,
+        (select name from cb_fire_team where sequence_nbr = ff.fire_team_id) fireTeamName
+        FROM
+        cb_firefighters ff
         where is_delete = 0
         and fire_team_id in
         <if test="teamIds != null">