Skip to content

A
amos-boot-biz
Commit a69e35cd authored by tangwei's avatar tangwei
Browse files
Options

修改接口

parent 5a7a558a
Show whitespace changes
Inline Side-by-side
Showing with 5 additions and 4 deletions
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/FireTeamMapper.xml
View file @ a69e35cd
...@@ -127,6 +127,7 @@ ...@@ -127,6 +127,7 @@
SELECT SELECT
a.name , a.name ,
a.sequence_nbr sequenceNbr,
( SELECT count( 1 ) FROM cb_firefighters WHERE fire_team_id = a.sequence_nbr AND is_delete = 0 ) userNum ( SELECT count( 1 ) FROM cb_firefighters WHERE fire_team_id = a.sequence_nbr AND is_delete = 0 ) userNum
FROM cb_fire_team a FROM cb_fire_team a
where a.is_delete=0 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
View file @ a69e35cd
...@@ -214,7 +214,7 @@ public class FireTeamServiceImpl extends BaseService<FireTeamDto, FireTeam, Fire ...@@ -214,7 +214,7 @@ public class FireTeamServiceImpl extends BaseService<FireTeamDto, FireTeam, Fire
if(result1!=null&&result1.size()>0){ if(result1!=null&&result1.size()>0){
Map<String, Object> combineResultMap = new HashMap<String, Object>(); Map<String, Object> combineResultMap = new HashMap<String, Object>();
result1.stream().forEach(obj ->{ result1.stream().forEach(obj ->{
combineResultMap.putAll(obj); combineResultMap.put(obj.get("teamId").toString(),obj.get("carNum"));
}); });
list.stream().forEach(obj ->{ list.stream().forEach(obj ->{
if(combineResultMap.containsKey(obj.getSequenceNbr())){ if(combineResultMap.containsKey(obj.getSequenceNbr())){
...@@ -248,11 +248,11 @@ public class FireTeamServiceImpl extends BaseService<FireTeamDto, FireTeam, Fire ...@@ -248,11 +248,11 @@ public class FireTeamServiceImpl extends BaseService<FireTeamDto, FireTeam, Fire
if(result1!=null&&result1.size()>0){ if(result1!=null&&result1.size()>0){
Map<String, Object> combineResultMap = new HashMap<String, Object>(); Map<String, Object> combineResultMap = new HashMap<String, Object>();
result1.stream().forEach(obj ->{ result1.stream().forEach(obj ->{
combineResultMap.putAll(obj); combineResultMap.put(obj.get("teamId").toString(),obj.get("carNum"));
}); });
list.stream().forEach(obj ->{ list.stream().forEach(obj ->{
if(combineResultMap.containsKey(obj.getSequenceNbr())){ if(combineResultMap.containsKey(obj.getSequenceNbr().toString())){
obj.setCarNum(Integer.valueOf(combineResultMap.get(obj.getSequenceNbr()).toString())); obj.setCarNum(Integer.valueOf(combineResultMap.get(obj.getSequenceNbr().toString()).toString()));
} }
}); });
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment