修改bug

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

@@ -32,7 +32,7 @@ public interface FirefightersMapper extends BaseMapper<Firefighters> {
 
     List<FirefightersTreeDto> getFirefightersJobTitleCount();
 
-    List<String> getFirefightersName( );
+    List<Map<String,String>> getFirefightersName( );
 
 	List<FirefightersExcelDto> exportToExcel(Boolean isDelete, String name, String postQualification, String fireTeamId,
 			String state, String areasExpertise, String jobTitle);

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

@@ -159,9 +159,10 @@ WHERE
 <if test='jobTitle!=null'>and f.job_title_code = #{jobTitle}</if>
 	</select>
 
-	<select id="getFirefightersName" resultType="string">
+	<select id="getFirefightersName" resultType="Map">
 		SELECT
-			cb_firefighters.name
+			cb_firefighters.name AS name,
+			cb_firefighters.mobile_phone AS phone
 		FROM
 			cb_firefighters
 		WHERE

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/mapper/AlertCalledMapper.java

@@ -36,7 +36,7 @@ public interface AlertCalledMapper extends BaseMapper<AlertCalled> {
 
     List<AlertCalledTodyDto> getTodayAlertCalled();
 
-    List<String> getContactName( );
+    List<Map<String,String>> getContactName( );
 
     List<String> getAddress();
 

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/resources/mapper/AlertCalledMapper.xml

@@ -232,9 +232,10 @@
 
     </select>
 
-    <select id="getContactName" resultType="string">
+    <select id="getContactName" resultType="Map">
         SELECT
-            jc_alert_called.contact_user
+            jc_alert_called.contact_user AS name,
+            jc_alert_called.contact_phone AS phone
         FROM
             jc_alert_called
         WHERE

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

@@ -124,7 +124,7 @@ public class FirefightersServiceImpl extends BaseService<FirefightersDto, Firefi
 		return menus;
 	}
 
-	public List<String> getFirefightersName() {
+	public List<Map<String,String>> getFirefightersName() {
 
 		return firefightersMapper.getFirefightersName();
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/AlertCalledController.java

@@ -362,7 +362,7 @@ public class AlertCalledController extends BaseController {
     @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/getAmosId", method = RequestMethod.GET)
     @ApiOperation(httpMethod = "GET", value = "警情填报联系人模糊查询", notes = "警情填报联系人模糊查询")
-    public ResponseModel< List<String>> getContact ( ) {
+    public ResponseModel< List<Map<String,String>>> getContact ( ) {
 
         return ResponseHelper.buildResponse(iAlertCalledService.getContactName());
     }

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/AlertCalledServiceImpl.java

@@ -797,9 +797,9 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto, AlertCal
     }
 
     /*2304 地址 联系人模糊查询缺失  陈召 2021-09-23 开始*/
-    public List<String> getContactName() {
-        List<String> firefightersName = firefightersService.getFirefightersName();
-        List<String> contactNames = alertCalledMapper.getContactName();
+    public List<Map<String,String>> getContactName() {
+        List<Map<String,String>> firefightersName = firefightersService.getFirefightersName();
+        List<Map<String,String>> contactNames = alertCalledMapper.getContactName();
         firefightersName.addAll(contactNames);
 
         return firefightersName;