消息通知调整
parent
ba2d58d37b
commit
05fb156277
|
|
@ -555,7 +555,7 @@ public class FireCheckListQueryExe {
|
||||||
}
|
}
|
||||||
List<String> fireCheckIdList = noFinishedCheckList.stream().map(FireCheckListDO::getFireCheckId).collect(Collectors.toList());
|
List<String> fireCheckIdList = noFinishedCheckList.stream().map(FireCheckListDO::getFireCheckId).collect(Collectors.toList());
|
||||||
//查找所有负责人
|
//查找所有负责人
|
||||||
List<FireCheckListUserDO> fireCheckListUserDOList = fireCheckListUserRepository.getListUserNameByFireCheckIdList(fireCheckIdList);
|
List<FireCheckListUserDO> fireCheckListUserDOList = fireCheckListUserRepository.getListUserIdByFireCheckIdList(fireCheckIdList);
|
||||||
Map<String, List<Long>> fireCheckListUserDONameMap = fireCheckListUserDOList.stream()
|
Map<String, List<Long>> fireCheckListUserDONameMap = fireCheckListUserDOList.stream()
|
||||||
.collect(Collectors.groupingBy(
|
.collect(Collectors.groupingBy(
|
||||||
FireCheckListUserDO::getFireCheckId,
|
FireCheckListUserDO::getFireCheckId,
|
||||||
|
|
|
||||||
|
|
@ -25,5 +25,7 @@ public interface FireCheckListUserMapper extends BaseMapper<FireCheckListUserDO>
|
||||||
List<FireCheckListUserDO> getListUserByFireCheckIdList(List<String> fireCheckIdList);
|
List<FireCheckListUserDO> getListUserByFireCheckIdList(List<String> fireCheckIdList);
|
||||||
|
|
||||||
List<FireCheckListUserDO> getListByFireCheckId(String fireCheckId);
|
List<FireCheckListUserDO> getListByFireCheckId(String fireCheckId);
|
||||||
|
|
||||||
|
List<FireCheckListUserDO> getListUserIdByFireCheckIdList(List<String> fireCheckIdList);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -28,5 +28,7 @@ public interface FireCheckListUserRepository extends BaseRepository<FireCheckLis
|
||||||
List<FireCheckListUserDO> getListUserByFireCheckIdList(List<String> fireCheckIdList);
|
List<FireCheckListUserDO> getListUserByFireCheckIdList(List<String> fireCheckIdList);
|
||||||
|
|
||||||
List<FireCheckListUserDO> getListByFireCheckId(String fireCheckId);
|
List<FireCheckListUserDO> getListByFireCheckId(String fireCheckId);
|
||||||
|
|
||||||
|
List<FireCheckListUserDO> getListUserIdByFireCheckIdList(List<String> fireCheckIdList);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -67,5 +67,10 @@ public class FireCheckListUserRepositoryImpl extends BaseRepositoryImpl<FireChec
|
||||||
return fireCheckListUserMapper.getListByFireCheckId(fireCheckId);
|
return fireCheckListUserMapper.getListByFireCheckId(fireCheckId);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public List<FireCheckListUserDO> getListUserIdByFireCheckIdList(List<String> fireCheckIdList) {
|
||||||
|
return fireCheckListUserMapper.getListUserIdByFireCheckIdList(fireCheckIdList);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -81,5 +81,18 @@
|
||||||
where cu.delete_enum = 'FALSE' and cu.fire_check_id=#{fireCheckId}
|
where cu.delete_enum = 'FALSE' and cu.fire_check_id=#{fireCheckId}
|
||||||
|
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
|
<select id="getListUserIdByFireCheckIdList"
|
||||||
|
resultType="com.zcloud.fire.check.persistence.dataobject.FireCheckListUserDO">
|
||||||
|
select cu.*,
|
||||||
|
GROUP_CONCAT(DISTINCT u.name) AS userName
|
||||||
|
from fire_check_list_user cu
|
||||||
|
left join user u on cu.user_id = u.id
|
||||||
|
where cu.delete_enum = 'FALSE' and cu.fire_check_id in
|
||||||
|
<foreach collection="fireCheckIdList" item="fireCheckId" open="(" close=")" separator=",">
|
||||||
|
#{fireCheckId}
|
||||||
|
</foreach>
|
||||||
|
group by cu.id
|
||||||
|
</select>
|
||||||
</mapper>
|
</mapper>
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue