更改获取所有消防人员的方法，添加年龄的显示

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/mapper/FirefightersMapper.java

@@ -38,4 +38,6 @@ public interface FirefightersMapper extends BaseMapper<Firefighters> {
 			String state, String areasExpertise, String jobTitle);
 
 	List<FirefightersDto> queryById(@Param("gw")String[] gw, @Param("name")String name);
+	
+	 List<Map<String,String>> selectNormalFirePerson(String jobCode);
 }

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

@@ -190,5 +190,29 @@
             </foreach>
         </if>
     </select>
+    
+     <select id="selectNormalFirePerson"
+            resultType="Map">
+SELECT
+	cff.*,
+	cft. NAME as fireTeamName,
+	case when 	cff.age is null then "" else cff.age end as realAge
+  from (
+		SELECT
+			cf.*,
+			FLOOR(datediff(CURDATE(),cf.birthday_time)/365.25) AS age
+		FROM
+			cb_firefighters cf
+		WHERE
+			(
+				cf.state_code IN ('94', '98')
+				OR cf.state_code IS NULL
+			)
+		AND cf.is_delete = FALSE
+		AND cf.job_title_code = #{jobCode}
+	) cff
+LEFT JOIN cb_fire_team cft ON cff.fire_team_id = cft.sequence_nbr
+
+    </select>
 
 </mapper>

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/FirefightersServiceImpl.java

@@ -168,16 +168,7 @@ public class FirefightersServiceImpl extends BaseService<FirefightersDto, Firefi
 	}
 
 	public Object getAllFirefightersPerson(int size, int current, String jobCode) {
-		LambdaQueryWrapper<Firefighters> wrapper = new LambdaQueryWrapper<Firefighters>();
-		wrapper.eq(Firefighters::getIsDelete, false);
-		wrapper.eq(Firefighters::getStateCode, "94");//在职
-		if(StringUtils.isNotBlank(jobCode)) {
-			wrapper.eq(Firefighters::getJobTitleCode, jobCode);
-		}
-		if(current!=0) {
-			wrapper.last("limit "+current+","+size);
-		}
-		return this.baseMapper.selectMaps(wrapper);
+		return firefightersMapper.selectNormalFirePerson(jobCode);
 	}
 	
 }