修改接口

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

@@ -127,6 +127,7 @@
 
         SELECT
         a.name ,
+        a.sequence_nbr sequenceNbr,
         ( SELECT count( 1 ) FROM cb_firefighters WHERE fire_team_id = a.sequence_nbr AND is_delete = 0 ) userNum
         FROM cb_fire_team a
         where  a.is_delete=0

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

@@ -214,7 +214,7 @@ public class FireTeamServiceImpl extends BaseService<FireTeamDto, FireTeam, Fire
         if(result1!=null&&result1.size()>0){
             Map<String, Object>   combineResultMap =  new HashMap<String, Object>();
             result1.stream().forEach(obj ->{
-                combineResultMap.putAll(obj);
+            	 combineResultMap.put(obj.get("teamId").toString(),obj.get("carNum"));
             });
             list.stream().forEach(obj ->{
                 if(combineResultMap.containsKey(obj.getSequenceNbr())){
@@ -248,11 +248,11 @@ public class FireTeamServiceImpl extends BaseService<FireTeamDto, FireTeam, Fire
         if(result1!=null&&result1.size()>0){
             Map<String, Object>   combineResultMap =  new HashMap<String, Object>();
             result1.stream().forEach(obj ->{
-                combineResultMap.putAll(obj);
+                combineResultMap.put(obj.get("teamId").toString(),obj.get("carNum"));
             });
             list.stream().forEach(obj ->{
-                if(combineResultMap.containsKey(obj.getSequenceNbr())){
-                    obj.setCarNum(Integer.valueOf(combineResultMap.get(obj.getSequenceNbr()).toString()));
+                if(combineResultMap.containsKey(obj.getSequenceNbr().toString())){
+                    obj.setCarNum(Integer.valueOf(combineResultMap.get(obj.getSequenceNbr().toString()).toString()));
                 }
             });
        }