修改bug

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

@@ -133,6 +133,9 @@
         Round(st_distance(point(a.longitude,a.latitude),point(#{par.longitude},#{par.latitude}))*111195,1) AS distance
         FROM cb_fire_team a
         where  a.is_delete=0 and a.longitude is not null and a.latitude   is not null
+        <if test='par.typeCode==null'>
+            and  a.type_code in (116,830)
+        </if>
         <if test='par.typeCode!=null and par.typeCode!=""'>
             and  a.type_code in (#{par.typeCode})
         </if>
@@ -147,7 +150,9 @@
         COUNT(a.sequence_nbr) num
         FROM cb_fire_team a
         where  a.is_delete=0 and a.longitude is not null and a.latitude   is not null
-
+        <if test='par.typeCode==null'>
+            and  a.type_code in (116,830)
+        </if>
         <if test='par.typeCode!=null and par.typeCode!=""'>
             and  a.type_code in (#{par.typeCode})
         </if>

amos-boot-module/amos-boot-module-biz/amos-boot-module-command-biz/src/main/java/com/yeejoin/amos/boot/module/command/biz/controller/CommandController.java

@@ -496,9 +496,9 @@ public class CommandController extends BaseController {
     @GetMapping(value = "ZQ/list")
     @ApiOperation(httpMethod = "GET", value = "执勤实力列表分页查询", notes = "执勤实力列表分页查询")
     public ResponseModel<IPage<FireTeamZhDto>> ZQlistPage(Integer pageNum, Integer pageSize, RequestData par) {
-        if(par.getTypeCode()==null){
-            par.setTypeCode( AlertStageEnums.ZZZD.getCode()+","+AlertStageEnums.YLJY.getCode());
-        }
+//        if(par.getTypeCode()==null){
+//            par.setTypeCode( AlertStageEnums.ZZZD.getCode()+","+AlertStageEnums.YLJY.getCode());
+//        }
         Page<FireTeamZhDto> pageBean = new Page<>(pageNum, pageSize);
         List<FireTeamZhDto>  list= iFireTeamService.getFireTeamList(pageNum,pageSize,par);
         Integer num=  iFireTeamService.getFireTeamListCount(par);

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

@@ -330,17 +330,21 @@ public class FireTeamServiceImpl extends BaseService<FireTeamDto, FireTeam, Fire
 		ResponseModel<List<Map<String, Object>>> result = equipFeignClient.getFireCarListAllcount();
 
 		List<Map<String, Object>> result1 = result.getResult();
-
-		list.forEach(fireTeamZhDto -> {
-			Long sequenceNbr = fireTeamZhDto.getSequenceNbr();
-			result1.forEach(map -> {
-				String mapId = String.valueOf(map.get("teamId"));
-				if (String.valueOf(sequenceNbr).equals(mapId)) {
-					Integer carNum = Integer.valueOf(map.get("carNum").toString());
-					fireTeamZhDto.setCarNum(carNum);
-				}
+        if(result1!=null&&result1.size()> 0){
+			list.forEach(fireTeamZhDto -> {
+				Long sequenceNbr = fireTeamZhDto.getSequenceNbr();
+				result1.forEach(map -> {
+					String mapId = String.valueOf(map.get("teamId"));
+					if (String.valueOf(sequenceNbr).equals(mapId)) {
+						Integer carNum = Integer.valueOf(map.get("carNum").toString());
+						fireTeamZhDto.setCarNum(carNum);
+					}
+				});
 			});
-		});
+		}
+
+
+
 		/*
 		 * 
 		 * if(result1!=null&&result1.size()>0){ Map<String, Object> combineResultMap =